DRAFT: Always enable Protobuf in packages and add Protobuf files to distro #18308
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Protobuf is now required for Mgmtd anyway, so we can just build with protobuf support at all times. There is no additional dependency Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Install mgmtd_testc and fpm_listener with the test tools Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Protobuf is now required for Mgmtd anyway, so we can just build with protobuf support at all times. There is no additional dependency Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Make/Make Install needs to install the proto files. We install them into the main /usr/lib/frr directory (or similar as configured). Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
Adding an additional search path for the topotests to look for proto files. This allows topotest to run protobuf tests with an installed package. Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
donaldsharp
reviewed
Mar 5, 2025
| --disable-zeromq \ | ||
| --enable-ospfapi \ | ||
| --enable-bgp-vnc \ | ||
| --enable-multipath=256 \ | ||
| --enable-pcre2posix \ | ||
| \ | ||
| --enable-mgmtd-test-be-client \ | ||
| --enable-fpm-listener \ |
There was a problem hiding this comment.
fpm-listener probably should be it's own commit or spelled out the reason for the inclusion here. Since it is not related to protobuf changes at all.
donaldsharp
reviewed
Mar 5, 2025
| @@ -96,6 +97,12 @@ override_dh_auto_install: | |||
| cp -r tools/etc/* debian/tmp/etc/ | |||
| -rm debian/tmp/etc/frr/daemons.conf | |||
|
|
|||
| # install proto files to /usr/lib/frr | |||
| #ifneq ($(filter pkg.frr.grpc,$(DEB_BUILD_PROFILES)),) | |||
| # cp usr/lib/x86_64-linux-gnu/frr/frr/mgmt.proto debian/tmp/usr/lib/frr/ | |||
donaldsharp
reviewed
Mar 5, 2025
| @@ -835,9 +841,19 @@ sed -i 's/ -M rpki//' %{_sysconfdir}/frr/daemons | |||
| %endif | |||
|
|
|||
|
|
|||
| %files test-tools | |||
| %{_sbindir}/mgmtd_testc | |||
| %{_sbindir}/fpm_listener | |||
There was a problem hiding this comment.
fpm_listener change should be separate or called out in the commit message
|
Modulus the couple of comments/nits I have this seems pretty reasonable. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Opening this as a s draft to get some comments. Personally, I'm not convinced that this is the right way to do it, but can't get an idea for some better solution. Comments are appreciated.
Main feedback initially would be appreciated on what I did (so we can agree there) and I can work on potentially cleaning up the work after we agreed there
The main motivation which started this was to get Topotests working for the protobuf tests with package builds.
Changes done:
Signed-off-by: Martin Winter mwinter@opensourcerouting.org