[PATCH] packages/fff: Tidy up wget dependencies
robert
rlanghammer at web.de
Do Jun 27 08:43:21 CEST 2019
Hi Adrian,
wir nehmen einfach den Patch. Die dependencies schöner machen kann man
ja mal mit einem anderen Patch. Dann aber überall.
Reviewed-by: Robert Langhammer <rlanghammer at web.de>
Am 16.06.19 um 18:43 schrieb Adrian Schmutzler:
> 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 at adrianschmutzler.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 89bdc93d..db1b899b 100644
> --- a/src/packages/fff/fff-config/Makefile
> +++ b/src/packages/fff/fff-config/Makefile
> @@ -13,7 +13,7 @@ define Package/$(PKG_NAME)
> CATEGORY:=Freifunk
> TITLE:=Freifunk-Franken Config
> URL:=http://www.freifunk-franken.de
> - DEPENDS:=+fff-boardname + at 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 f1a62896..8bd7e5fa 100644
> --- a/src/packages/fff/fff-hoods/Makefile
> +++ b/src/packages/fff/fff-hoods/Makefile
> @@ -13,7 +13,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 \
> + + 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 7bc33755..6a56f3b5 100644
> --- a/src/packages/fff/fff-vpn-select/Makefile
> +++ b/src/packages/fff/fff-vpn-select/Makefile
> @@ -13,7 +13,8 @@ define Package/$(PKG_NAME)
> CATEGORY:=Freifunk
> TITLE:= Freifunk-Franken vpn-select
> URL:=http://www.freifunk-franken.de
> - DEPENDS:=+ at BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT \
> + DEPENDS:=+ at BUSYBOX_CONFIG_WGET \
> + + at 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 \
> + + at BUSYBOX_CONFIG_WGET + at BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
> endef
>
> define Package/$(PKG_NAME)/description
Mehr Informationen über die Mailingliste franken-dev