fff-base: Do not manually select fff-vpn-select

Submitted by Adrian Schmutzler on Feb. 3, 2019, 4:25 p.m.

Details

Message ID 20190203162541.1108-1-freifunk@adrianschmutzler.de
State Accepted
Headers show

Commit Message

Adrian Schmutzler Feb. 3, 2019, 4:25 p.m.
Since we went on to the KeyXchangeV2, fff-vpn-select is a pure
subpackage/utility of fff-hoods. Thus, we should not manually
select it, but have it selected indirectly by fff-hoods.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

---

Based on the two patches to introduce build variants.
---
 src/packages/fff/fff/Makefile | 1 -
 1 file changed, 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile
index 9749ddc6..7ba8d82a 100644
--- a/src/packages/fff/fff/Makefile
+++ b/src/packages/fff/fff/Makefile
@@ -38,7 +38,6 @@  define Package/fff-node
     TITLE+=(Home node)
     DEPENDS+=+fff-fastd \
              +fff-firewall \
-             +fff-vpn-select \
              +fff-uradvd \
              +fff-hoods
     VARIANT:=homenode

Comments

Tim Niemeyer Feb. 3, 2019, 4:58 p.m.
On Sun, 2019-02-03 at 17:25 +0100, Adrian Schmutzler wrote:
> Since we went on to the KeyXchangeV2, fff-vpn-select is a pure
> subpackage/utility of fff-hoods. Thus, we should not manually
> select it, but have it selected indirectly by fff-hoods.
> 
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Tim Niemeyer <tim@tn-x.org>

Tim

> 
> ---
> 
> Based on the two patches to introduce build variants.
> ---
>  src/packages/fff/fff/Makefile | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/src/packages/fff/fff/Makefile
> b/src/packages/fff/fff/Makefile
> index 9749ddc6..7ba8d82a 100644
> --- a/src/packages/fff/fff/Makefile
> +++ b/src/packages/fff/fff/Makefile
> @@ -38,7 +38,6 @@ define Package/fff-node
>      TITLE+=(Home node)
>      DEPENDS+=+fff-fastd \
>               +fff-firewall \
> -             +fff-vpn-select \
>               +fff-uradvd \
>               +fff-hoods
>      VARIANT:=homenode
Adrian Schmutzler Feb. 5, 2019, 1:45 p.m.
Applied.

 

From: Tim Niemeyer [mailto:tim@tn-x.org] 
Sent: Sonntag, 3. Februar 2019 17:59
To: Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken-dev@freifunk.net
Subject: Re: [PATCH] fff-base: Do not manually select fff-vpn-select

 

On Sun, 2019-02-03 at 17:25 +0100, Adrian Schmutzler wrote: 
> Since we went on to the KeyXchangeV2, fff-vpn-select is a pure 
> subpackage/utility of fff-hoods. Thus, we should not manually 
> select it, but have it selected indirectly by fff-hoods. 
> 
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de <mailto:freifunk@adrianschmutzler.de> > 
Reviewed-by: Tim Niemeyer <tim@tn-x.org <mailto:tim@tn-x.org> > 

Tim 

> 
> --- 
> 
> Based on the two patches to introduce build variants. 
> --- 
>  src/packages/fff/fff/Makefile | 1 - 
>  1 file changed, 1 deletion(-) 
> 
> diff --git a/src/packages/fff/fff/Makefile 
> b/src/packages/fff/fff/Makefile 
> index 9749ddc6..7ba8d82a 100644 
> --- a/src/packages/fff/fff/Makefile 
> +++ b/src/packages/fff/fff/Makefile 
> @@ -38,7 +38,6 @@ define Package/fff-node 
>      TITLE+=(Home node) 
>      DEPENDS+=+fff-fastd \ 
>               +fff-firewall \ 
> -             +fff-vpn-select \ 
>               +fff-uradvd \ 
>               +fff-hoods 
>      VARIANT:=homenode