Skip to contentSkip to conversation

package/bird: select at least one protocol

PATCH New Fabrice Fontaine 3 participants 4 messages Oct 15, 2019 – Oct 16, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/bird: select at least one protocol

bird needs at least one protocol so select BGP if no other protocols are selected as BGP is already the default one

Fixes:
- http://autobuild.buildroot.org/results/0b00948eed9bb8405b70f3f9112ecce99b365f35

---
 package/bird/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/bird/Config.in +5 -1
index c2951c74c3..3baf43f98e 100644
@@ -1,6 +1,11 @@
 config BR2_PACKAGE_BIRD
 	bool "bird"
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_BIRD_BGP if !(BR2_PACKAGE_BIRD_BABEL || \
+		BR2_PACKAGE_BIRD_BFD || BR2_PACKAGE_BIRD_MRT || \
+		BR2_PACKAGE_BIRD_OSPF || BR2_PACKAGE_BIRD_PERF || \
+		BR2_PACKAGE_BIRD_PIPE || BR2_PACKAGE_BIRD_RADV || \
+		BR2_PACKAGE_BIRD_RIP || BR2_PACKAGE_BIRD_STATIC)
 	help
 	  BIRD Internet Routing Daemon
 
@@ -38,7 +43,6 @@ comment "BFD protocol needs a toolchain w/ NPTL"
 
 config BR2_PACKAGE_BIRD_BGP
 	bool "bgp"
-	default y
 	help
 	  Enable BGP protocol.
 
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 package/bird: select at least one protocol

Hello,

I'd like to have the review of Adrien on this patch. Adrien, could you comment? Also, I have my own comment, see below.

Quoted 16 lines · On Tue, 15 Oct 2019 21:23:03 +0200 Fabrice Fontaine…

bird needs at least one protocol so select BGP if no other protocols are selected as BGP is already the default one

Fixes:
- http://autobuild.buildroot.org/results/0b00948eed9bb8405b70f3f9112ecce99b365f35

---
 package/bird/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/bird/Config.in +0 -0
index c2951c74c3..3baf43f98e 100644

package/bird/Config.in line 8

Quoted 8 lines
package/bird/Config.in +5 -0
@@ -1,6 +1,11 @@
 config BR2_PACKAGE_BIRD
 	bool "bird"
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_BIRD_BGP if !(BR2_PACKAGE_BIRD_BABEL || \
+		BR2_PACKAGE_BIRD_BFD || BR2_PACKAGE_BIRD_MRT || \
+		BR2_PACKAGE_BIRD_OSPF || BR2_PACKAGE_BIRD_PERF || \
+		BR2_PACKAGE_BIRD_PIPE || BR2_PACKAGE_BIRD_RADV || \
+		BR2_PACKAGE_BIRD_RIP || BR2_PACKAGE_BIRD_STATIC)

This is not so nice. Perhaps we could do it like this:

config BR2_PACKAGE_BIRD_AT_LEAST_ONE_PROTOCOL
bool

config BR2_PACKAGE_BIRD

	bool "bird"
	...
	select BR2_PACKAGE_BIRD_BGP if !BR2_PACKAGE_BIRD_AT_LEAST_ONE_PROTOCOL

if BR2_PACKAGE_BIRD

config BR2_PACKAGE_BIRD_BGP
bool "bgp"
select BR2_PACKAGE_BIRD_AT_LEAST_ONE_PROTOCOL

...

endif

Does this work ?

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/bird: select at least one protocol

Hi,

Quoted 56 lines · Thomas Petazzoni

Hello,

I'd like to have the review of Adrien on this patch. Adrien, could you comment? Also, I have my own comment, see below.

Quoted 16 lines · On Tue, 15 Oct 2019 21:23:03 +0200 Fabrice Fontaine…

bird needs at least one protocol so select BGP if no other protocols are selected as BGP is already the default one

Fixes:
- http://autobuild.buildroot.org/results/0b00948eed9bb8405b70f3f9112ecce99b365f35

---
 package/bird/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/bird/Config.in +0 -0
index c2951c74c3..3baf43f98e 100644

package/bird/Config.in line 8

Quoted 8 lines
package/bird/Config.in +5 -0
@@ -1,6 +1,11 @@
 config BR2_PACKAGE_BIRD
      bool "bird"
      depends on BR2_USE_MMU # fork()
+     select BR2_PACKAGE_BIRD_BGP if !(BR2_PACKAGE_BIRD_BABEL || \
+             BR2_PACKAGE_BIRD_BFD || BR2_PACKAGE_BIRD_MRT || \
+             BR2_PACKAGE_BIRD_OSPF || BR2_PACKAGE_BIRD_PERF || \
+             BR2_PACKAGE_BIRD_PIPE || BR2_PACKAGE_BIRD_RADV || \
+             BR2_PACKAGE_BIRD_RIP || BR2_PACKAGE_BIRD_STATIC)

This is not so nice. Perhaps we could do it like this:

config BR2_PACKAGE_BIRD_AT_LEAST_ONE_PROTOCOL
bool

config BR2_PACKAGE_BIRD
bool "bird"
...
select BR2_PACKAGE_BIRD_BGP if !BR2_PACKAGE_BIRD_AT_LEAST_ONE_PROTOCOL

if BR2_PACKAGE_BIRD

config BR2_PACKAGE_BIRD_BGP
bool "bgp"
select BR2_PACKAGE_BIRD_AT_LEAST_ONE_PROTOCOL

...

endif

Does this work ?

Quoted 7 lines

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

I didn't test the patch yet, but so far I was ok with it. I may have missed something but the Kconfig doc is not really clear about the correct way to handle this.

I'm still digging to find a clean way to fix all builds, as for example --with-protocols=perf will also fail..
We can fix upstream or add some dependencies (perf alone doesn't make really sense).

Regards,
Adrien

#3 lore raw

PATCH 1/1 package/bird: select at least one protocol

Hi,

Le mer. 16 oct. 2019 ? 23:05, Adrien Gallou?t <[email protected]> a ?crit :

Quoted 69 lines

Hi,

Quoted 56 lines · Thomas Petazzoni

Hello,

I'd like to have the review of Adrien on this patch. Adrien, could you comment? Also, I have my own comment, see below.

Quoted 16 lines · On Tue, 15 Oct 2019 21:23:03 +0200 Fabrice Fontaine…

bird needs at least one protocol so select BGP if no other protocols are selected as BGP is already the default one

Fixes:
- http://autobuild.buildroot.org/results/0b00948eed9bb8405b70f3f9112ecce99b365f35

---
 package/bird/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/bird/Config.in +0 -0
index c2951c74c3..3baf43f98e 100644

package/bird/Config.in line 8

Quoted 8 lines
package/bird/Config.in +5 -0
@@ -1,6 +1,11 @@
 config BR2_PACKAGE_BIRD
      bool "bird"
      depends on BR2_USE_MMU # fork()
+     select BR2_PACKAGE_BIRD_BGP if !(BR2_PACKAGE_BIRD_BABEL || \
+             BR2_PACKAGE_BIRD_BFD || BR2_PACKAGE_BIRD_MRT || \
+             BR2_PACKAGE_BIRD_OSPF || BR2_PACKAGE_BIRD_PERF || \
+             BR2_PACKAGE_BIRD_PIPE || BR2_PACKAGE_BIRD_RADV || \
+             BR2_PACKAGE_BIRD_RIP || BR2_PACKAGE_BIRD_STATIC)

This is not so nice. Perhaps we could do it like this:

config BR2_PACKAGE_BIRD_AT_LEAST_ONE_PROTOCOL
bool

config BR2_PACKAGE_BIRD
bool "bird"
...
select BR2_PACKAGE_BIRD_BGP if !BR2_PACKAGE_BIRD_AT_LEAST_ONE_PROTOCOL

if BR2_PACKAGE_BIRD

config BR2_PACKAGE_BIRD_BGP
bool "bgp"
select BR2_PACKAGE_BIRD_AT_LEAST_ONE_PROTOCOL

...

endif

Does this work ?

Quoted 7 lines

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Quoted 8 lines

I didn't test the patch yet, but so far I was ok with it. I may have missed something but the Kconfig doc is not really clear about the correct way to handle this.

I'm still digging to find a clean way to fix all builds, as for example --with-protocols=perf will also fail..
We can fix upstream or add some dependencies (perf alone doesn't make really sense).

From my understanding, a lot of (all ?) build failures are linked to the following error:

bison -Dparse.lac=full -Dparse.error=verbose -dv -pcf_ -b obj/conf/cf-parse obj/conf/cf-parse.y nest/config.Y:381.20-23: error: symbol LINK is used, but is not defined as a token and has no rules
381 | | dev_proto CHECK LINK bool ';' { DIRECT_CFG->check_link = $4; }
| ^~~~
make[1]: *** [obj/conf/cf-parse.tab.c] Error 1

This error is raised because of the following commit:
https://gitlab.labs.nic.cz/labs/bird/commit/e90dd656cc9126e1fbcc45fb77a10bf1baa2a1b5

This commit assumes that LINK is defined which is not always the case. After more investigations, it seems that LINK is not defined by BFD, MRT, PERF, PIPE, RPKI:
https://gitlab.labs.nic.cz/labs/bird/blob/master/proto/bfd/config.Y

So a best patch would be to force the selection of at least babel, bgp, ospf, radv, rip or static (or fix nest/config.Y)

Quoted 3 lines

Regards,
Adrien

Best Regards,

Fabrice