Update tunneldigger

Submitted by Robert Langhammer on Dec. 4, 2017, 10:28 p.m.

Details

Message ID 20171204222803.2176-1-rlanghammer@web.de
State Accepted
Headers show

Commit Message

Robert Langhammer Dec. 4, 2017, 10:28 p.m.
We need the new tunneldigger because the old broker no longer works with the current kernel.

Signed-off-by: Robert Langhammer <rlanghammer@web.de>

---
 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(-)

Patch hide | download patch | download mbox

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

Comments

Robert Langhammer Dec. 5, 2017, 1:43 a.m.
Dummerweise v3 im Subject vergessen.
Dafuer eben nochmal getestet.

Testet-by: Robert Langhammer <rlanghammer@web.de>


Am 04.12.2017 um 23:28 schrieb Robert Langhammer:
> We need the new tunneldigger because the old broker no longer works with the current kernel.
>
> Signed-off-by: Robert Langhammer <rlanghammer@web.de>
>
> ---
>  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
Adrian Schmutzler Dec. 5, 2017, 11:09 a.m.
Hallo,

das cmake betrifft nur das Kompilieren, oder wird dadurch das Firmware-Image
größer?

Grüße

Adrian

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
> Of robert
> Sent: Dienstag, 5. Dezember 2017 02:44
> To: franken-dev@freifunk.net
> Subject: Re: [PATCH] Update tunneldigger
> 
> Dummerweise v3 im Subject vergessen.
> Dafuer eben nochmal getestet.
> 
> Testet-by: Robert Langhammer <rlanghammer@web.de>
> 
> 
> Am 04.12.2017 um 23:28 schrieb Robert Langhammer:
> > We need the new tunneldigger because the old broker no longer works
> with the current kernel.
> >
> > Signed-off-by: Robert Langhammer <rlanghammer@web.de>
> >
> > ---
> >  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
> 
> --
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Fabian Blaese Dec. 5, 2017, 12:01 p.m.
Hallo Adrian,

“normalerweise" fällt aus diesem cmake ein Makefile raus, mit dem dann gebaut werden kann.
Das scheint das lede buildsystem auch so zu machen.
Je nachdem, was jetzt im Makefile steht, könnte sich die Größe des Binaries ändern, ist aber eher unwahrscheinlich. Ich bau grade nochmal den master als vergleich durch.

Fabian

> On 5. Dec 2017, at 12:09, Adrian Schmutzler <mail@adrianschmutzler.de> wrote:
> 
> Hallo,
> 
> das cmake betrifft nur das Kompilieren, oder wird dadurch das Firmware-Image
> größer?
> 
> Grüße
> 
> Adrian
> 
>> -----Original Message-----
>> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
>> Of robert
>> Sent: Dienstag, 5. Dezember 2017 02:44
>> To: franken-dev@freifunk.net
>> Subject: Re: [PATCH] Update tunneldigger
>> 
>> Dummerweise v3 im Subject vergessen.
>> Dafuer eben nochmal getestet.
>> 
>> Testet-by: Robert Langhammer <rlanghammer@web.de>
>> 
>> 
>> Am 04.12.2017 um 23:28 schrieb Robert Langhammer:
>>> We need the new tunneldigger because the old broker no longer works
>> with the current kernel.
>>> 
>>> Signed-off-by: Robert Langhammer <rlanghammer@web.de>
>>> 
>>> ---
>>> 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
>> 
>> --
>> franken-dev mailing list
>> franken-dev@freifunk.net
>> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
> 
> --
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Fabian Blaese Dec. 7, 2017, 9:30 a.m.
Tut soweit. Weiterhin sollte überlegt werden, ob man bei der vpn.txt bleiben will - allerdings in einem extra Patch.

Reviewed-by: Fabian Bläse <fabian@blaese.de>
Tested-by: Fabian Bläse <fabian@blaese.de>

Fabian
Tim Niemeyer Dec. 23, 2017, 12:11 p.m.
Hi

Und applied.

Danke
Tim

Am Montag, den 04.12.2017, 23:28 +0100 schrieb Robert Langhammer:
> We need the new tunneldigger because the old broker no longer works
> with the current kernel.
> 
> Signed-off-by: Robert Langhammer <rlanghammer@web.de>
> 
> ---
>  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
> -- 
> 2.11.0
>