package/bird: make RIP optional

In commit 529fef57f6 ("package/bird: add
optional protocols") we added options to conditionally enable
different protocol support. However, disabling the RIP support was not
working, so it remained forcefully enabled, and there was no
BR2_PACKAGE_BIRD_RIP option.

However, since the bump to 2.0.6 in commit
b9f43ade0f, this issue has been fixed,
so we can introduce the BR2_PACKAGE_BIRD_RIP option, and make it
really optional.

Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Adrien Gallouët 2019-09-28 07:36:02 +00:00 committed by Thomas Petazzoni
parent 686f40c0b4
commit 722b977af9
2 changed files with 5 additions and 2 deletions

View File

@ -67,6 +67,11 @@ config BR2_PACKAGE_BIRD_RADV
help help
Enable RAdv protocol. Enable RAdv protocol.
config BR2_PACKAGE_BIRD_RIP
bool "rip"
help
Enable RIP protocol.
config BR2_PACKAGE_BIRD_STATIC config BR2_PACKAGE_BIRD_STATIC
bool "static" bool "static"
help help

View File

@ -17,9 +17,7 @@ else
BIRD_CONF_OPTS += --disable-client BIRD_CONF_OPTS += --disable-client
endif endif
# BUG: RIP is mandatory for now
BIRD_PROTOCOLS = \ BIRD_PROTOCOLS = \
rip \
$(if $(BR2_PACKAGE_BIRD_BFD),bfd) \ $(if $(BR2_PACKAGE_BIRD_BFD),bfd) \
$(if $(BR2_PACKAGE_BIRD_BABEL),babel) \ $(if $(BR2_PACKAGE_BIRD_BABEL),babel) \
$(if $(BR2_PACKAGE_BIRD_BGP),bgp) \ $(if $(BR2_PACKAGE_BIRD_BGP),bgp) \