* [Buildroot] [PATCH 1/1] package/bird: add optional protocols
@ 2019-03-20 21:09 Adrien Gallouët
2019-03-26 19:16 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Adrien Gallouët @ 2019-03-20 21:09 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adrien Gallou?t <adrien@gallouet.fr>
---
package/bird/Config.in | 46 ++++++++++++++++++++++++++++++++++++++++++
package/bird/bird.mk | 16 +++++++++++++++
2 files changed, 62 insertions(+)
diff --git a/package/bird/Config.in b/package/bird/Config.in
index a69551f94e..298348d098 100644
--- a/package/bird/Config.in
+++ b/package/bird/Config.in
@@ -20,4 +20,50 @@ config BR2_PACKAGE_BIRD_CLIENT
help
Enable the BIRD client
+config BR2_PACKAGE_BIRD_BABEL
+ bool "babel"
+ help
+ Enable Babel protocol.
+
+config BR2_PACKAGE_BIRD_BFD
+ bool "bfd"
+ help
+ Enable BFD protocol.
+
+config BR2_PACKAGE_BIRD_BGP
+ bool "bgp"
+ default y
+ help
+ Enable BGP protocol.
+
+config BR2_PACKAGE_BIRD_MRT
+ bool "mrt"
+ help
+ Enable MRT protocol.
+
+config BR2_PACKAGE_BIRD_OSPF
+ bool "ospf"
+ help
+ Enable OSPFv2 and OSPFv3 protocol.
+
+config BR2_PACKAGE_BIRD_PERF
+ bool "perf"
+ help
+ Enable Perf protocol.
+
+config BR2_PACKAGE_BIRD_PIPE
+ bool "pipe"
+ help
+ Enable Pipe protocol.
+
+config BR2_PACKAGE_BIRD_RADV
+ bool "radv"
+ help
+ Enable RAdv protocol.
+
+config BR2_PACKAGE_BIRD_STATIC
+ bool "static"
+ help
+ Enable Static protocol.
+
endif
diff --git a/package/bird/bird.mk b/package/bird/bird.mk
index e165be61c0..26bec01ebf 100644
--- a/package/bird/bird.mk
+++ b/package/bird/bird.mk
@@ -17,4 +17,20 @@ else
BIRD_CONF_OPTS += --disable-client
endif
+# BUG: RIP is needed for now
+BR2_PACKAGE_BIRD_RIP=y
+
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_BFD),bfd,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_BABEL),babel,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_BGP),bgp,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_MRT),mrt,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_OSPF),ospf,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_PERF),perf,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_PIPE),pipe,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_RADV),radv,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_RIP),rip,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_STATIC),static,)
+
+BIRD_CONF_OPTS += --with-protocols=$(subst $(space),$(comma),$(strip $(BR2_PACKAGE_BIRD_PROTOCOLS)))
+
$(eval $(autotools-package))
--
2.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/bird: add optional protocols
2019-03-20 21:09 [Buildroot] [PATCH 1/1] package/bird: add optional protocols Adrien Gallouët
@ 2019-03-26 19:16 ` Thomas Petazzoni
2019-03-27 8:24 ` Adrien Gallouët
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2019-03-26 19:16 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 20 Mar 2019 21:09:44 +0000
Adrien Gallou?t <adrien@gallouet.fr> wrote:
> Signed-off-by: Adrien Gallou?t <adrien@gallouet.fr>
> ---
> package/bird/Config.in | 46 ++++++++++++++++++++++++++++++++++++++++++
> package/bird/bird.mk | 16 +++++++++++++++
> 2 files changed, 62 insertions(+)
I've applied, but I had to fix a number of things, see below.
>
> diff --git a/package/bird/Config.in b/package/bird/Config.in
> index a69551f94e..298348d098 100644
> --- a/package/bird/Config.in
> +++ b/package/bird/Config.in
> @@ -20,4 +20,50 @@ config BR2_PACKAGE_BIRD_CLIENT
> help
> Enable the BIRD client
I added a Config.in comment here to make it clear the below options are
for configuring the list of supported protocols.
> +# BUG: RIP is needed for now
> +BR2_PACKAGE_BIRD_RIP=y
BR2_PACKAGE_* is reserved for config options. Variables in a package
should be prefixed by the package name.
> +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_BFD),bfd,)
> +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_BABEL),babel,)
> +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_BGP),bgp,)
> +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_MRT),mrt,)
> +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_OSPF),ospf,)
> +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_PERF),perf,)
> +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_PIPE),pipe,)
> +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_RADV),radv,)
> +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_RIP),rip,)
> +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_STATIC),static,)
> +
> +BIRD_CONF_OPTS += --with-protocols=$(subst $(space),$(comma),$(strip $(BR2_PACKAGE_BIRD_PROTOCOLS)))
So I've changed all of this by:
# BUG: RIP is mandatory for now
BIRD_PROTOCOLS = \
rip \
$(if $(BR2_PACKAGE_BIRD_BFD),bfd) \
$(if $(BR2_PACKAGE_BIRD_BABEL),babel) \
$(if $(BR2_PACKAGE_BIRD_BGP),bgp) \
$(if $(BR2_PACKAGE_BIRD_MRT),mrt) \
$(if $(BR2_PACKAGE_BIRD_OSPF),ospf) \
$(if $(BR2_PACKAGE_BIRD_PERF),perf) \
$(if $(BR2_PACKAGE_BIRD_PIPE),pipe) \
$(if $(BR2_PACKAGE_BIRD_RADV),radv) \
$(if $(BR2_PACKAGE_BIRD_RIP),rip) \
$(if $(BR2_PACKAGE_BIRD_STATIC),static)
BIRD_CONF_OPTS += --with-protocols=$(subst $(space),$(comma),$(strip $(BIRD_PROTOCOLS)))
and applied to master.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread* [Buildroot] [PATCH 1/1] package/bird: add optional protocols
2019-03-26 19:16 ` Thomas Petazzoni
@ 2019-03-27 8:24 ` Adrien Gallouët
0 siblings, 0 replies; 4+ messages in thread
From: Adrien Gallouët @ 2019-03-27 8:24 UTC (permalink / raw)
To: buildroot
On Tue, Mar 26, 2019 at 8:16 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Hello,
>
> On Wed, 20 Mar 2019 21:09:44 +0000
> Adrien Gallou?t <adrien@gallouet.fr> wrote:
>
> > Signed-off-by: Adrien Gallou?t <adrien@gallouet.fr>
> > ---
> > package/bird/Config.in | 46 ++++++++++++++++++++++++++++++++++++++++++
> > package/bird/bird.mk | 16 +++++++++++++++
> > 2 files changed, 62 insertions(+)
>
> I've applied, but I had to fix a number of things, see below.
>
> >
> > diff --git a/package/bird/Config.in b/package/bird/Config.in
> > index a69551f94e..298348d098 100644
> > --- a/package/bird/Config.in
> > +++ b/package/bird/Config.in
> > @@ -20,4 +20,50 @@ config BR2_PACKAGE_BIRD_CLIENT
> > help
> > Enable the BIRD client
>
> I added a Config.in comment here to make it clear the below options are
> for configuring the list of supported protocols.
>
> > +# BUG: RIP is needed for now
> > +BR2_PACKAGE_BIRD_RIP=y
>
> BR2_PACKAGE_* is reserved for config options. Variables in a package
> should be prefixed by the package name.
>
> > +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_BFD),bfd,)
> > +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_BABEL),babel,)
> > +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_BGP),bgp,)
> > +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_MRT),mrt,)
> > +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_OSPF),ospf,)
> > +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_PERF),perf,)
> > +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_PIPE),pipe,)
> > +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_RADV),radv,)
> > +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_RIP),rip,)
> > +BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_STATIC),static,)
> > +
> > +BIRD_CONF_OPTS += --with-protocols=$(subst $(space),$(comma),$(strip $(BR2_PACKAGE_BIRD_PROTOCOLS)))
>
> So I've changed all of this by:
>
> # BUG: RIP is mandatory for now
> BIRD_PROTOCOLS = \
> rip \
> $(if $(BR2_PACKAGE_BIRD_BFD),bfd) \
> $(if $(BR2_PACKAGE_BIRD_BABEL),babel) \
> $(if $(BR2_PACKAGE_BIRD_BGP),bgp) \
> $(if $(BR2_PACKAGE_BIRD_MRT),mrt) \
> $(if $(BR2_PACKAGE_BIRD_OSPF),ospf) \
> $(if $(BR2_PACKAGE_BIRD_PERF),perf) \
> $(if $(BR2_PACKAGE_BIRD_PIPE),pipe) \
> $(if $(BR2_PACKAGE_BIRD_RADV),radv) \
> $(if $(BR2_PACKAGE_BIRD_RIP),rip) \
> $(if $(BR2_PACKAGE_BIRD_STATIC),static)
>
> BIRD_CONF_OPTS += --with-protocols=$(subst $(space),$(comma),$(strip $(BIRD_PROTOCOLS)))
>
> and applied to master.
>
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Hi Thomas,
Thanks to you!
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/bird: add optional protocols
@ 2019-03-20 14:25 Adrien Gallouët
0 siblings, 0 replies; 4+ messages in thread
From: Adrien Gallouët @ 2019-03-20 14:25 UTC (permalink / raw)
To: buildroot
Signed-off-by: Adrien Gallou?t <adrien@gallouet.fr>
---
package/bird/Config.in | 51 ++++++++++++++++++++++++++++++++++++++++++
package/bird/bird.mk | 21 +++++++++++++++++
2 files changed, 72 insertions(+)
diff --git a/package/bird/Config.in b/package/bird/Config.in
index a69551f94e..6d3a05e3bb 100644
--- a/package/bird/Config.in
+++ b/package/bird/Config.in
@@ -20,4 +20,55 @@ config BR2_PACKAGE_BIRD_CLIENT
help
Enable the BIRD client
+config BR2_PACKAGE_BIRD_BABEL
+ bool "babel"
+ help
+ Enable Babel protocol.
+
+config BR2_PACKAGE_BIRD_BFD
+ bool "bfd"
+ help
+ Enable BFD protocol.
+
+config BR2_PACKAGE_BIRD_BGP
+ bool "bgp"
+ default y
+ help
+ Enable BGP protocol.
+
+config BR2_PACKAGE_BIRD_MRT
+ bool "mrt"
+ help
+ Enable MRT protocol.
+
+config BR2_PACKAGE_BIRD_OSPF
+ bool "ospf"
+ help
+ Enable OSPFv2 and OSPFv3 protocol.
+
+config BR2_PACKAGE_BIRD_PERF
+ bool "perf"
+ help
+ Enable Perf protocol.
+
+config BR2_PACKAGE_BIRD_PIPE
+ bool "pipe"
+ help
+ Enable Pipe protocol.
+
+config BR2_PACKAGE_BIRD_RADV
+ bool "radv"
+ help
+ Enable RAdv protocol.
+
+config BR2_PACKAGE_BIRD_RIP
+ bool "rip"
+ help
+ Enable RIP protocol.
+
+config BR2_PACKAGE_BIRD_STATIC
+ bool "static"
+ help
+ Enable Static protocol.
+
endif
diff --git a/package/bird/bird.mk b/package/bird/bird.mk
index e165be61c0..7dc851a592 100644
--- a/package/bird/bird.mk
+++ b/package/bird/bird.mk
@@ -10,6 +10,8 @@ BIRD_LICENSE = GPL-2.0+
BIRD_LICENSE_FILES = README
BIRD_DEPENDENCIES = host-flex host-bison
+BIRD_CONF_OPTS += --disable-mpls-kernel --disable-libssh
+
ifeq ($(BR2_PACKAGE_BIRD_CLIENT),y)
BIRD_CONF_OPTS += --enable-client
BIRD_DEPENDENCIES += ncurses readline
@@ -17,4 +19,23 @@ else
BIRD_CONF_OPTS += --disable-client
endif
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+BIRD_CONF_OPTS += --enable-pthreads
+else
+BIRD_CONF_OPTS += --disable-pthreads
+endif
+
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_BFD),bfd,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_BABEL),babel,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_BGP),bgp,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_MRT),mrt,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_OSPF),ospf,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_PERF),perf,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_PIPE),pipe,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_RADV),radv,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_RIP),rip,)
+BR2_PACKAGE_BIRD_PROTOCOLS += $(if $(BR2_PACKAGE_BIRD_STATIC),static,)
+
+BIRD_CONF_OPTS += --with-protocols=$(subst $(space),$(comma),$(strip $(BR2_PACKAGE_BIRD_PROTOCOLS)))
+
$(eval $(autotools-package))
--
2.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-03-27 8:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-20 21:09 [Buildroot] [PATCH 1/1] package/bird: add optional protocols Adrien Gallouët
2019-03-26 19:16 ` Thomas Petazzoni
2019-03-27 8:24 ` Adrien Gallouët
-- strict thread matches above, loose matches on Subject: below --
2019-03-20 14:25 Adrien Gallouët
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox