netdog: Enable conditional compilation based on network backend #2750
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
This commit sets the `SYSTEMD_NETWORKD` environment variable during the RPM build stage, which is useful to trigger on and emit additional Rust cfgs for conditional compilation.
bcressey
reviewed
Jan 25, 2023
This commit enables conditional compilation of `netdog` based on the network backend. A temporary function has been added that reads the environment variable `SYSTEMD_NETWORKD`, and emits additional cfgs to direct compilation. This environment variable will be passed to the build if a user has enabled the build flag to use systemd-networkd rather than wicked in their variant.
zmrow
force-pushed
the
emit-net-backend-cfgs
branch
from
f6e9d53 to
8a47c02
Compare
zmrow
changed the title
|
^ Scoped these changes to |
webern
approved these changes
Jan 27, 2023
Comment on lines
+37
to
+39
| NET_BACKEND_OVERRIDE | ||
| } else { | ||
| DEFAULT_NET_BACKEND |
There was a problem hiding this comment.
very much a nit: our other cfg! compile guards use lowercase, kebab-case strings, e.g. aws-k8s etc. So these screaming snake cases might look a little out of place at their usage sites.
There was a problem hiding this comment.
The actual cfgs emitted will be: wicked and systemd-networkd. These screaming snake case constants are set to those static strings. :)
zmrow
changed the title
bcressey
approved these changes
Jan 27, 2023
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.
Issue number:
Related to #2449
Description of changes:
This set of temporary changes enables conditional compilation of
netdogbased on network backend. "Temporary" in this case means that these changes (similar to those in #2741 ) will be removed oncesystemd-networkddevelopment has finished.A new function
emit_net_backend_cfgs()has been added tonetdog'sbuild.rsthat triggers off theSYSTEMD_NETWORKDenvironment variable that has been added to the build environment. The crate can now use the following to conditionally compile code:Testing done:
Added the following blurb to
netdog generate-net-configto be conditionally compiled:systemd-networkdbuild flag, I observed the above message in the journal. Without the flag, the message didn't show up.Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.