[PATCH] fff-base: Sort dependencies

[Christian Dresel]

hi

Reviewed-by: Christian Dresel <fff at chrisi01.de>

Gruß

Christian

On 05.02.19 15:08, Adrian Schmutzler wrote:
> Sort dependencies in two blocks (non-fff, fff) for each of our
> meta-packages.
>
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> ---
>  src/packages/fff/fff/Makefile | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
> index 2ed67724..976a69fa 100644
> --- a/src/packages/fff/fff/Makefile
> +++ b/src/packages/fff/fff/Makefile
> @@ -14,18 +14,18 @@ define Package/fff/base
>  	URL:=http://www.freifunk-franken.de
>  	DEPENDS:=+iptables \
>  			 +ip6tables \
> -			 +odhcp6c \
>  			 +micrond \
> +			 +odhcp6c \
> +			 +simple-tc \
> +			 +fff-batman-adv \
>  			 +fff-config \
> +			 +fff-network \
>  			 +fff-nodewatcher \
> -			 +fff-web \
> -			 +fff-batman-adv \
>  			 +fff-support \
> -			 +fff-network \
>  			 +fff-sysupgrade \
> -			 +fff-wireless \
>  			 +fff-timeserver \
> -			 +simple-tc
> +			 +fff-web \
> +			 +fff-wireless
>  endef
>  
>  define Package/fff/base/description
> @@ -37,8 +37,8 @@ define Package/fff-node
>  	TITLE+=(Home node)
>  	DEPENDS+=+fff-fastd \
>  			 +fff-firewall \
> -			 +fff-uradvd \
> -			 +fff-hoods
> +			 +fff-hoods \
> +			 +fff-uradvd
>  	VARIANT:=homenode
>  endef
>  
> @@ -49,21 +49,21 @@ endef
>  define Package/fff-layer3
>  	$(call Package/fff/base)
>  	TITLE+=(Layer 3 Gateway)
> -	DEPENDS+=+fff-dhcp \
> -			 +fff-babeld \
> -			 +fff-ra \
> -			 +arptables \
> +	DEPENDS+=+arptables \
>  			 +ebtables \
>  			 +ebtables-utils \
>  			 +kmod-ebtables-ipv4 \
>  			 +kmod-ebtables-ipv6 \
> -			 +iptables-mod-filter \
> -			 +iptables-mod-ipopt \
> -			 +iptables-mod-conntrack-extra \
>  			 +gre \
>  			 + at PACKAGE_grev4 \
>  			 + at PACKAGE_grev6 \
> -			 +fff-alfred-monitoring-proxy
> +			 +iptables-mod-conntrack-extra \
> +			 +iptables-mod-filter \
> +			 +iptables-mod-ipopt \
> +			 +fff-alfred-monitoring-proxy \
> +			 +fff-babeld \
> +			 +fff-dhcp \
> +			 +fff-ra
>  	VARIANT:=layer3
>  endef
>