[4/4] BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT

Submitted by Robert Langhammer on June 25, 2019, 12:33 p.m.

Details

Message ID 20190625123336.21719-5-rlanghammer@web.de
State Rejected
Headers show

Commit Message

Robert Langhammer June 25, 2019, 12:33 p.m. 
fff-vpn-select depends no longer on BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT. It can be removed but this is the only one dependence to ..WGET_TIMEOUT. The timeout is still used by fff-hoods, fff-sysupgrade and fff-web.

Signed-off-by: Robert Langhammer <rlanghammer@web.de>
---
 src/packages/fff/fff-hoods/Makefile      |  7 ++++++-
 src/packages/fff/fff-sysupgrade/Makefile |  6 +++++-
 src/packages/fff/fff-vpn-select/Makefile |  3 +--
 src/packages/fff/fff-web/Makefile        | 12 +++++++++++-
 4 files changed, 23 insertions(+), 5 deletions(-)

--
2.20.1

Patch hide | download patch | download mbox 

diff --git a/src/packages/fff/fff-hoods/Makefile b/src/packages/fff/fff-hoods/Makefile
index f1a6289..245fe33 100644
--- a/src/packages/fff/fff-hoods/Makefile
+++ b/src/packages/fff/fff-hoods/Makefile
@@ -13,7 +13,12 @@  define Package/$(PKG_NAME)
 	CATEGORY:=Freifunk
 	TITLE:= Freifunk-Franken hoods
 	URL:=http://www.freifunk-franken.de
-	DEPENDS:=+fff-hoodutils +fff-macnock +fff-vpn-select +fff-firewall
+	DEPENDS:=+fff-hoodutils \
+		+fff-macnock \
+		+fff-vpn-select \
+		+fff-firewall \
+		+@BUSYBOX_CONFIG_WGET \
+		+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
 endef

 define Package/$(PKG_NAME)/description
diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile
index 90ef66a..a0973fc 100644
--- a/src/packages/fff/fff-sysupgrade/Makefile
+++ b/src/packages/fff/fff-sysupgrade/Makefile
@@ -13,7 +13,11 @@  define Package/$(PKG_NAME)
 	CATEGORY:=Freifunk
 	TITLE:=Freifunk-Franken sysupgrade
 	URL:=http://www.freifunk-franken.de
-	DEPENDS:=+fff-boardname +fff-config +fff-hoodutils +@BUSYBOX_CONFIG_WGET
+	DEPENDS:=+fff-boardname \
+		+fff-config \
+		+fff-hoodutils \
+		+@BUSYBOX_CONFIG_WGET \
+		+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
 endef

 define Package/$(PKG_NAME)/description
diff --git a/src/packages/fff/fff-vpn-select/Makefile b/src/packages/fff/fff-vpn-select/Makefile
index 09dd7ea..7c66c57 100644
--- a/src/packages/fff/fff-vpn-select/Makefile
+++ b/src/packages/fff/fff-vpn-select/Makefile
@@ -13,8 +13,7 @@  define Package/$(PKG_NAME)
 	CATEGORY:=Freifunk
 	TITLE:= Freifunk-Franken vpn-select
 	URL:=http://www.freifunk-franken.de
-	DEPENDS:=+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT \
-			 +fff-fastd
+	DEPENDS:=+fff-fastd
 endef

 define Package/$(PKG_NAME)/description
diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile
index 819644a..ba46ba7 100644
--- a/src/packages/fff/fff-web/Makefile
+++ b/src/packages/fff/fff-web/Makefile
@@ -12,7 +12,17 @@  define Package/$(PKG_NAME)
 	CATEGORY:=Freifunk
 	TITLE:= Freifunk-Franken Webinterface
 	URL:=http://www.freifunk-franken.de
-	DEPENDS:=+uhttpd +libustream-mbedtls +haserl +px5g +simple-tc +fff-boardname +fff-config +fff-network +fff-hoodutils
+	DEPENDS:=+uhttpd \
+		+libustream-mbedtls \
+		+haserl \
+		+px5g \
+		+simple-tc \
+		+fff-boardname \
+		+fff-config \
+		+fff-network \
+		+fff-hoodutils \
+		+@BUSYBOX_CONFIG_WGET \
+		+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
 endef

 define Package/$(PKG_NAME)/description

Comments

Adrian Schmutzler June 25, 2019, 1 p.m. 
Hallo Robert,

hier würde ich jetzt tatsächlich meinen Patch lieber nehmen.

Zu deinem:

Ich würde den Commit-Namen etwas klarer machen ;-)

Die Dependency in fff-config kann noch mit weg.

Rest unten:

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of
> Robert Langhammer
> Sent: Dienstag, 25. Juni 2019 14:34
> To: franken-dev@freifunk.net
> Subject: [PATCH 4/4] BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
> 
> fff-vpn-select depends no longer on
> BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT. It can be removed but this is
> the only one dependence to ..WGET_TIMEOUT. The timeout is still used by fff-
> hoods, fff-sysupgrade and fff-web.
> 
> Signed-off-by: Robert Langhammer <rlanghammer@web.de>
> ---
>  src/packages/fff/fff-hoods/Makefile      |  7 ++++++-
>  src/packages/fff/fff-sysupgrade/Makefile |  6 +++++-
>  src/packages/fff/fff-vpn-select/Makefile |  3 +--
>  src/packages/fff/fff-web/Makefile        | 12 +++++++++++-
>  4 files changed, 23 insertions(+), 5 deletions(-)
> 
> diff --git a/src/packages/fff/fff-hoods/Makefile b/src/packages/fff/fff-
> hoods/Makefile
> index f1a6289..245fe33 100644
> --- a/src/packages/fff/fff-hoods/Makefile
> +++ b/src/packages/fff/fff-hoods/Makefile
> @@ -13,7 +13,12 @@ define Package/$(PKG_NAME)
>  	CATEGORY:=Freifunk
>  	TITLE:= Freifunk-Franken hoods
>  	URL:=http://www.freifunk-franken.de
> -	DEPENDS:=+fff-hoodutils +fff-macnock +fff-vpn-select +fff-firewall
> +	DEPENDS:=+fff-hoodutils \
> +		+fff-macnock \
> +		+fff-vpn-select \
> +		+fff-firewall \
> +		+@BUSYBOX_CONFIG_WGET \
> +		+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT

Das sieht schöner aus als bei mir.

>  endef
> 
>  define Package/$(PKG_NAME)/description
> diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-
> sysupgrade/Makefile
> index 90ef66a..a0973fc 100644
> --- a/src/packages/fff/fff-sysupgrade/Makefile
> +++ b/src/packages/fff/fff-sysupgrade/Makefile
> @@ -13,7 +13,11 @@ define Package/$(PKG_NAME)
>  	CATEGORY:=Freifunk
>  	TITLE:=Freifunk-Franken sysupgrade
>  	URL:=http://www.freifunk-franken.de
> -	DEPENDS:=+fff-boardname +fff-config +fff-hoodutils
> +@BUSYBOX_CONFIG_WGET
> +	DEPENDS:=+fff-boardname \
> +		+fff-config \
> +		+fff-hoodutils \
> +		+@BUSYBOX_CONFIG_WGET \
> +		+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT

Ich glaube, fff-sysupgrade nutzt das timeout nicht. Daher habe ich hier nichts verändert. Ist aber eine philosophische Diskussion.

>  endef
> 
>  define Package/$(PKG_NAME)/description
> diff --git a/src/packages/fff/fff-vpn-select/Makefile b/src/packages/fff/fff-vpn-
> select/Makefile
> index 09dd7ea..7c66c57 100644
> --- a/src/packages/fff/fff-vpn-select/Makefile
> +++ b/src/packages/fff/fff-vpn-select/Makefile
> @@ -13,8 +13,7 @@ define Package/$(PKG_NAME)
>  	CATEGORY:=Freifunk
>  	TITLE:= Freifunk-Franken vpn-select
>  	URL:=http://www.freifunk-franken.de
> -	DEPENDS:=+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT \
> -			 +fff-fastd
> +	DEPENDS:=+fff-fastd

Hier müsste meiner rebased werden.

Grüße

Adrian

>  endef
> 
>  define Package/$(PKG_NAME)/description
> diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-
> web/Makefile
> index 819644a..ba46ba7 100644
> --- a/src/packages/fff/fff-web/Makefile
> +++ b/src/packages/fff/fff-web/Makefile
> @@ -12,7 +12,17 @@ define Package/$(PKG_NAME)
>  	CATEGORY:=Freifunk
>  	TITLE:= Freifunk-Franken Webinterface
>  	URL:=http://www.freifunk-franken.de
> -	DEPENDS:=+uhttpd +libustream-mbedtls +haserl +px5g +simple-tc +fff-
> boardname +fff-config +fff-network +fff-hoodutils
> +	DEPENDS:=+uhttpd \
> +		+libustream-mbedtls \
> +		+haserl \
> +		+px5g \
> +		+simple-tc \
> +		+fff-boardname \
> +		+fff-config \
> +		+fff-network \
> +		+fff-hoodutils \
> +		+@BUSYBOX_CONFIG_WGET \
> +		+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
>  endef
> 
>  define Package/$(PKG_NAME)/description
> --
> 2.20.1
Robert Langhammer June 25, 2019, 2:17 p.m. 
Am 25.06.19 um 15:00 schrieb Adrian Schmutzler:
> Hallo Robert,
>
> hier würde ich jetzt tatsächlich meinen Patch lieber nehmen.
>
> Zu deinem:
>
> Ich würde den Commit-Namen etwas klarer machen ;-)
>
> Die Dependency in fff-config kann noch mit weg.
fff-config hat keine Dependency zu WGET_TIMEOUT. Du meinst
@BUSYBOX_CONFIG_WGET. Ja, Abhängigkeiten aufräumen wäre mal was für ein
verregnetes Novemberwochenende :-)
> Rest unten:
>
>> -----Original Message-----
>> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of
>> Robert Langhammer
>> Sent: Dienstag, 25. Juni 2019 14:34
>> To: franken-dev@freifunk.net
>> Subject: [PATCH 4/4] BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
>>
>> fff-vpn-select depends no longer on
>> BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT. It can be removed but this is
>> the only one dependence to ..WGET_TIMEOUT. The timeout is still used by fff-
>> hoods, fff-sysupgrade and fff-web.
>>
>> Signed-off-by: Robert Langhammer <rlanghammer@web.de>
>> ---
>>  src/packages/fff/fff-hoods/Makefile      |  7 ++++++-
>>  src/packages/fff/fff-sysupgrade/Makefile |  6 +++++-
>>  src/packages/fff/fff-vpn-select/Makefile |  3 +--
>>  src/packages/fff/fff-web/Makefile        | 12 +++++++++++-
>>  4 files changed, 23 insertions(+), 5 deletions(-)
>>
>> diff --git a/src/packages/fff/fff-hoods/Makefile b/src/packages/fff/fff-
>> hoods/Makefile
>> index f1a6289..245fe33 100644
>> --- a/src/packages/fff/fff-hoods/Makefile
>> +++ b/src/packages/fff/fff-hoods/Makefile
>> @@ -13,7 +13,12 @@ define Package/$(PKG_NAME)
>>  	CATEGORY:=Freifunk
>>  	TITLE:= Freifunk-Franken hoods
>>  	URL:=http://www.freifunk-franken.de
>> -	DEPENDS:=+fff-hoodutils +fff-macnock +fff-vpn-select +fff-firewall
>> +	DEPENDS:=+fff-hoodutils \
>> +		+fff-macnock \
>> +		+fff-vpn-select \
>> +		+fff-firewall \
>> +		+@BUSYBOX_CONFIG_WGET \
>> +		+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
> Das sieht schöner aus als bei mir.
Man sollte die mal alle umbauen. Aktuell haben wir einen Mischmasch. In
einzelnen Zeilen ist es übersichtlicher.
>
>>  endef
>>
>>  define Package/$(PKG_NAME)/description
>> diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-
>> sysupgrade/Makefile
>> index 90ef66a..a0973fc 100644
>> --- a/src/packages/fff/fff-sysupgrade/Makefile
>> +++ b/src/packages/fff/fff-sysupgrade/Makefile
>> @@ -13,7 +13,11 @@ define Package/$(PKG_NAME)
>>  	CATEGORY:=Freifunk
>>  	TITLE:=Freifunk-Franken sysupgrade
>>  	URL:=http://www.freifunk-franken.de
>> -	DEPENDS:=+fff-boardname +fff-config +fff-hoodutils
>> +@BUSYBOX_CONFIG_WGET
>> +	DEPENDS:=+fff-boardname \
>> +		+fff-config \
>> +		+fff-hoodutils \
>> +		+@BUSYBOX_CONFIG_WGET \
>> +		+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
> Ich glaube, fff-sysupgrade nutzt das timeout nicht. Daher habe ich hier nichts verändert. Ist aber eine philosophische Diskussion.
Tatsächlich, da ist wget ohne timeout drin. Sollte man vielleicht mit
einbauen. ??? - Ist eine andere Baustelle.
>
>>  endef
>>
>>  define Package/$(PKG_NAME)/description
>> diff --git a/src/packages/fff/fff-vpn-select/Makefile b/src/packages/fff/fff-vpn-
>> select/Makefile
>> index 09dd7ea..7c66c57 100644
>> --- a/src/packages/fff/fff-vpn-select/Makefile
>> +++ b/src/packages/fff/fff-vpn-select/Makefile
>> @@ -13,8 +13,7 @@ define Package/$(PKG_NAME)
>>  	CATEGORY:=Freifunk
>>  	TITLE:= Freifunk-Franken vpn-select
>>  	URL:=http://www.freifunk-franken.de
>> -	DEPENDS:=+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT \
>> -			 +fff-fastd
>> +	DEPENDS:=+fff-fastd
> Hier müsste meiner rebased werden.
>
> Grüße
>
> Adrian
>
>>  endef
>>
>>  define Package/$(PKG_NAME)/description
>> diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-
>> web/Makefile
>> index 819644a..ba46ba7 100644
>> --- a/src/packages/fff/fff-web/Makefile
>> +++ b/src/packages/fff/fff-web/Makefile
>> @@ -12,7 +12,17 @@ define Package/$(PKG_NAME)
>>  	CATEGORY:=Freifunk
>>  	TITLE:= Freifunk-Franken Webinterface
>>  	URL:=http://www.freifunk-franken.de
>> -	DEPENDS:=+uhttpd +libustream-mbedtls +haserl +px5g +simple-tc +fff-
>> boardname +fff-config +fff-network +fff-hoodutils
>> +	DEPENDS:=+uhttpd \
>> +		+libustream-mbedtls \
>> +		+haserl \
>> +		+px5g \
>> +		+simple-tc \
>> +		+fff-boardname \
>> +		+fff-config \
>> +		+fff-network \
>> +		+fff-hoodutils \
>> +		+@BUSYBOX_CONFIG_WGET \
>> +		+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
>>  endef
>>
>>  define Package/$(PKG_NAME)/description
>> --
>> 2.20.1