From patchwork Mon Dec 4 22:28:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Update tunneldigger From: Robert Langhammer X-Patchwork-Id: 712 Message-Id: <20171204222803.2176-1-rlanghammer@web.de> To: franken-dev@freifunk.net Date: Mon, 4 Dec 2017 23:28:03 +0100 We need the new tunneldigger because the old broker no longer works with the current kernel. Signed-off-by: Robert Langhammer Reviewed-by: Fabian Bläse Tested-by: Fabian Bläse --- v2: some new commits on github.com/wlanslovenija since v1 increment PKG_VERSION correctly v3: add cmake.mk; cmake is used now change binary to tunneldiger --- src/packages/fff/tunneldigger/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/packages/fff/tunneldigger/Makefile b/src/packages/fff/tunneldigger/Makefile index 7b91acd..5a12045 100644 --- a/src/packages/fff/tunneldigger/Makefile +++ b/src/packages/fff/tunneldigger/Makefile @@ -1,9 +1,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tunneldigger -PKG_VERSION:=0.4.5 +PKG_VERSION:=0.4.6 PKG_RELEASE:=1 -PKG_REV:=0bae1419da12de64d1c7571c5f6649d39d682052 +PKG_REV:=20e52a59180c4285aca932557f804bba08ce78b3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git @@ -12,6 +12,7 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk define Package/$(PKG_NAME) SECTION:=net @@ -28,12 +29,11 @@ TARGET_CFLAGS += \ define Build/Prepare $(call Build/Prepare/Default) mv $(PKG_BUILD_DIR)/client/* $(PKG_BUILD_DIR) - sed -i s/-lnl/-lnl-tiny/g $(PKG_BUILD_DIR)/Makefile endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/l2tp_client $(1)/usr/bin/tunneldigger + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tunneldigger $(1)/usr/bin/tunneldigger $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/tunneldigger.init $(1)/etc/init.d/tunneldigger $(INSTALL_DIR) $(1)/etc/config