From 63e6e0da0647263c1de9e12dd434a47c1f5a9b7e Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Sun, 7 Jul 2019 02:03:28 +0200 Subject: [PATCH] mmfd: split package into mmfd and gluon-mmfd, bump mmfd version * include ability to open socket * include dependency for libjson-c --- net/mmfd/Makefile | 12 ++++++++---- net/mmfd/files/etc/init.d/mmfd | 25 ------------------------- 2 files changed, 8 insertions(+), 29 deletions(-) delete mode 100755 net/mmfd/files/etc/init.d/mmfd diff --git a/net/mmfd/Makefile b/net/mmfd/Makefile index 4ea108d..dc13f38 100644 --- a/net/mmfd/Makefile +++ b/net/mmfd/Makefile @@ -1,10 +1,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mmfd -PKG_SOURCE_DATE:=2019-07-07 +PKG_SOURCE_DATE:=2019-07-20 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/freifunk-gluon/mmfd.git -PKG_SOURCE_VERSION:=2a9ff51260e81ae47caa3c7c3fcdbe84357bd561 +PKG_SOURCE_VERSION:=3c4ce688e40c32e7dfbf945d9f224353fe5d8363 + +PKG_BUILD_DEPENDS += libjson-c + +CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE:STRING=MINSIZEREL +#CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE:STRING=Debug include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -13,11 +18,10 @@ define Package/mmfd SECTION:=net CATEGORY:=Network TITLE:=mesh multicast forwarding daemon - DEPENDS:= +kmod-tun + DEPENDS:= +kmod-tun +libjson-c endef define Package/mmfd/install - $(CP) ./files/* $(1)/ $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mmfd $(1)/usr/sbin/ endef diff --git a/net/mmfd/files/etc/init.d/mmfd b/net/mmfd/files/etc/init.d/mmfd deleted file mode 100755 index 3f05cbd..0000000 --- a/net/mmfd/files/etc/init.d/mmfd +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh /etc/rc.common - -USE_PROCD=1 -START=50 - -DAEMON=/usr/sbin/mmfd - -start_service() { - procd_open_instance - procd_set_param command $DAEMON - procd_set_param respawn ${respawn_threshold:-60} ${respawn_timeout:-1} ${respawn_retry:-0} - procd_set_param stderr 1 - procd_set_param stdout 1 - procd_close_instance -} - -service_triggers() { - local script=$(readlink "$initscript") - local name=$(basename "${script:-$initscript}") - - procd_open_trigger - procd_add_raw_trigger "interface.*" 0 "/etc/init.d/$name" reload - procd_close_trigger -} -