McUles
/
firmware
forked from freifunk-franken/firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

packages/fff: Tidy up wget dependencies 

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>
This commit is contained in:
Adrian Schmutzler 2019-06-27 14:44:24 +02:00
parent e9268539d1
commit 0889cf35d8
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/packages/fff/fff-config/Makefile
View File

@ -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

3
src/packages/fff/fff-hoods/Makefile
View File

@ -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

3
src/packages/fff/fff-vpn-select/Makefile
View File

@ -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

4
src/packages/fff/fff-web/Makefile
View File

@ -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