From 0889cf35d8c099122df91397b433bb60af4b6307 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler <freifunk@adrianschmutzler.de> Date: Thu, 27 Jun 2019 14:44:24 +0200 Subject: [PATCH] packages/fff: Tidy up wget dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The symbols BUSYBOX_CONFIG_WGET and BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT are set in different packages and do not correlate with where Busybox wget is actually used. This updates packages dependencies based on the current situation. Note that with current firmware, both two versions of wget are installed: /bin/wget /usr/bin/wget The latter is from busybox and is used as the default version. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Reviewed-by: Robert Langhammer <rlanghammer@web.de> Reviewed-by: Fabian Bläse <fabian@blaese.de> --- src/packages/fff/fff-config/Makefile | 2 +- src/packages/fff/fff-hoods/Makefile | 3 ++- src/packages/fff/fff-vpn-select/Makefile | 3 ++- src/packages/fff/fff-web/Makefile | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/packages/fff/fff-config/Makefile b/src/packages/fff/fff-config/Makefile index 10c7e02e..1b7af481 100644 --- a/src/packages/fff/fff-config/Makefile +++ b/src/packages/fff/fff-config/Makefile @@ -12,7 +12,7 @@ define Package/$(PKG_NAME) CATEGORY:=Freifunk TITLE:=Freifunk-Franken Config URL:=http://www.freifunk-franken.de - DEPENDS:=+fff-boardname +@BUSYBOX_CONFIG_WGET + DEPENDS:=+fff-boardname endef define Package/$(PKG_NAME)/description diff --git a/src/packages/fff/fff-hoods/Makefile b/src/packages/fff/fff-hoods/Makefile index 259e5fde..9b6abd57 100644 --- a/src/packages/fff/fff-hoods/Makefile +++ b/src/packages/fff/fff-hoods/Makefile @@ -12,7 +12,8 @@ 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-vpn-select/Makefile b/src/packages/fff/fff-vpn-select/Makefile index 8120a5d1..34a736ea 100644 --- a/src/packages/fff/fff-vpn-select/Makefile +++ b/src/packages/fff/fff-vpn-select/Makefile @@ -12,7 +12,8 @@ define Package/$(PKG_NAME) CATEGORY:=Freifunk TITLE:= Freifunk-Franken vpn-select URL:=http://www.freifunk-franken.de - DEPENDS:=+@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT \ + DEPENDS:=+@BUSYBOX_CONFIG_WGET \ + +@BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT \ +fff-tunneldigger \ +fff-fastd endef diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile index 819644a5..0e3550f5 100644 --- a/src/packages/fff/fff-web/Makefile +++ b/src/packages/fff/fff-web/Makefile @@ -12,7 +12,9 @@ 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 -- GitLab