[PATCH 4/4] BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT

Robert Langhammer rlanghammer at web.de
Di Jun 25 14:33:36 CEST 2019


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 at 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 \
+		+ at BUSYBOX_CONFIG_WGET \
+		+ at 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 + at BUSYBOX_CONFIG_WGET
+	DEPENDS:=+fff-boardname \
+		+fff-config \
+		+fff-hoodutils \
+		+ at BUSYBOX_CONFIG_WGET \
+		+ at 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:=+ at 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 \
+		+ at BUSYBOX_CONFIG_WGET \
+		+ at BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
 endef

 define Package/$(PKG_NAME)/description
--
2.20.1



Mehr Informationen über die Mailingliste franken-dev