[4/6] Only use fff-batman-adv for node-variant

Submitted by Fabian Blaese on May 25, 2019, 6:48 p.m.

Details

Message ID 20190525184833.20820-5-fabian@blaese.de
State Accepted
Headers show

Commit Message

Fabian Blaese May 25, 2019, 6:48 p.m.
---
 src/packages/fff/fff/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
index 1cb5833..18a1230 100644
--- a/src/packages/fff/fff/Makefile
+++ b/src/packages/fff/fff/Makefile
@@ -20,7 +20,6 @@  define Package/fff/base
 			 +fff-config \
 			 +fff-nodewatcher \
 			 +fff-web \
-			 +fff-batman-adv \
 			 +fff-support \
 			 +fff-network \
 			 +fff-sysupgrade \
@@ -39,6 +38,7 @@  define Package/fff-node
 	DEPENDS+=+fff-fastd \
 			 +fff-firewall \
 			 +fff-uradvd \
+			 +fff-batman-adv \
 			 +fff-hoods
 	VARIANT:=homenode
 endef

Comments

Adrian Schmutzler May 25, 2019, 7 p.m.
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

Ich habe das bei mir auch so gemacht. Die GW-Firmware hat bei mir dann eine eigene vollwertige Package fff-batman-adv-server, die nicht von fff-batman-adv abhängt.

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
> Of Fabian Bläse
> Sent: Samstag, 25. Mai 2019 20:49
> To: franken-dev@freifunk.net
> Subject: [PATCH 4/6] Only use fff-batman-adv for node-variant
> 
> ---
>  src/packages/fff/fff/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
> index 1cb5833..18a1230 100644
> --- a/src/packages/fff/fff/Makefile
> +++ b/src/packages/fff/fff/Makefile
> @@ -20,7 +20,6 @@ define Package/fff/base
>  			 +fff-config \
>  			 +fff-nodewatcher \
>  			 +fff-web \
> -			 +fff-batman-adv \
>  			 +fff-support \
>  			 +fff-network \
>  			 +fff-sysupgrade \
> @@ -39,6 +38,7 @@ define Package/fff-node
>  	DEPENDS+=+fff-fastd \
>  			 +fff-firewall \
>  			 +fff-uradvd \
> +			 +fff-batman-adv \
>  			 +fff-hoods
>  	VARIANT:=homenode
>  endef
> --
> 2.21.0
Robert Langhammer May 30, 2019, 11:08 p.m.
Hi Fabian,

Reviewed-by: Robert Langhammer <rlanghammer@web.de>

Am 25.05.19 um 20:48 schrieb Fabian Bläse:
> ---
>  src/packages/fff/fff/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
> index 1cb5833..18a1230 100644
> --- a/src/packages/fff/fff/Makefile
> +++ b/src/packages/fff/fff/Makefile
> @@ -20,7 +20,6 @@ define Package/fff/base
>  			 +fff-config \
>  			 +fff-nodewatcher \
>  			 +fff-web \
> -			 +fff-batman-adv \
>  			 +fff-support \
>  			 +fff-network \
>  			 +fff-sysupgrade \
> @@ -39,6 +38,7 @@ define Package/fff-node
>  	DEPENDS+=+fff-fastd \
>  			 +fff-firewall \
>  			 +fff-uradvd \
> +			 +fff-batman-adv \
>  			 +fff-hoods
>  	VARIANT:=homenode
>  endef
Fabian Blaese May 31, 2019, 4:32 p.m.
Fehlendes Signed-off-by ergänzt und mit Pfad in Commitmessage (siehe Patches 1-3) applied.