fff-base: Sort dependencies

Submitted by Adrian Schmutzler on Feb. 5, 2019, 2:08 p.m.

Details

Message ID 20190205140852.2256-1-freifunk@adrianschmutzler.de
State New
Headers show

Commit Message

Adrian Schmutzler Feb. 5, 2019, 2:08 p.m.
Sort dependencies in two blocks (non-fff, fff) for each of our
meta-packages.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff/Makefile | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

Patch hide | download patch | download mbox

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 \
 			 +@PACKAGE_grev4 \
 			 +@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
 

Comments

Christian Dresel Feb. 10, 2019, 2:39 p.m.
hi

Reviewed-by: Christian Dresel <fff@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@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 \
>  			 +@PACKAGE_grev4 \
>  			 +@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
>
Tim Niemeyer Feb. 10, 2019, 2:59 p.m.
Hi

Wenn es nicht zwingend nötig ist, lieber so lassen wie es ist, weil das
rebasen bei $Menschen schwer macht.

Tim

Am Dienstag, den 05.02.2019, 15:08 +0100 schrieb Adrian Schmutzler:
> Sort dependencies in two blocks (non-fff, fff) for each of our
> meta-packages.
> 
> Signed-off-by: Adrian Schmutzler <freifunk@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 \
>  			 +@PACKAGE_grev4 \
>  			 +@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
>
Adrian Schmutzler Feb. 10, 2019, 4:23 p.m.
Hallo,

 

das ist halt auch wieder so eine Geschmackssache:

 

Macht man es einmal ordentlich und dann müssen ein paar alte Patches rebased werden, oder macht man sich für immer die Mühe, sich durch das Wirrwarr zu suchen, wenn man dann einen neuen Patch baut.

 

Ich könnte mir als Kompromiss vorstellen, dass man erstmal die Gateway-Firmware „fertig“ macht (und diesen Patch zurückstellt) und ich danach nochmal einen Sortierpatch schicke, dann sollte es ja keinen signifikanten Rebase-Bedarf mehr geben.

 

Grüße

 

Adrian

 

From: Tim Niemeyer [mailto:tim@tn-x.org] 
Sent: Sonntag, 10. Februar 2019 16:00
To: Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken-dev@freifunk.net
Subject: Re: [PATCH] fff-base: Sort dependencies

 

Hi 

Wenn es nicht zwingend nötig ist, lieber so lassen wie es ist, weil das 
rebasen bei $Menschen schwer macht. 

Tim 

Am Dienstag, den 05.02.2019, 15:08 +0100 schrieb Adrian Schmutzler: 
> Sort dependencies in two blocks (non-fff, fff) for each of our 
> meta-packages. 
> 
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de <mailto:freifunk@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 \ 
>                        +@PACKAGE_grev4 \ 
>                        +@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 
>