-
Notifications
You must be signed in to change notification settings - Fork 94
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Install config verity prep #1068
Merged
cgwalters
merged 7 commits into
containers:main
from
cgwalters:install-config-verity-prep
Feb 3, 2025
Merged
Install config verity prep #1068
cgwalters
merged 7 commits into
containers:main
from
cgwalters:install-config-verity-prep
Feb 3, 2025
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
cgwalters
force-pushed
the
install-config-verity-prep
branch
4 times, most recently
from
February 2, 2025 22:32
f684da3
to
b067d67
Compare
Signed-off-by: Colin Walters <[email protected]>
Prep for further work. Signed-off-by: Colin Walters <[email protected]>
Prep for using this to determine fsverity. Signed-off-by: Colin Walters <[email protected]>
In preparation for vendoring composefs-rs from git. Basically before, things work fine when we're just vendoring from crates.io, but fall over when we add a git dependency. The Fedora `cargo_prep` macro writes a hardcoded `.cargo/config.toml` which only has a replacement for `crates.io`, but we need the generated replacement for git too which is output by `cargo vendor-filterer` - which previously we were discarding. This was surprisingly difficult! - Capture the output of `vendor-filterer` - Work around a bug where it puts a broken `directory` path in the generated TOML - Insert that as a new `vendor-config.toml` in our source - Do use `cargo_prep` to init the RPM config in the spec, but re-inject our vendor config appended to that one. Signed-off-by: Colin Walters <[email protected]>
We require a newer Rust. TODO re-enable post 9.6 Signed-off-by: Colin Walters <[email protected]>
To match composefs-rs. Signed-off-by: Colin Walters <[email protected]>
And expose some fsverity helpers. This is just to get the ball rolling on integration. Signed-off-by: Colin Walters <[email protected]>
cgwalters
force-pushed
the
install-config-verity-prep
branch
from
February 3, 2025 14:10
b067d67
to
cca41fb
Compare
Man, this has been a crazy chain of things I hit. The vendoring thing was surprisingly complicated. But OK, now the latest thing is that composefs-rs's MSRV is newer than what's in RHEL9.5 (not C9S, so we know we're good for 9.6+). |
jmarrero
approved these changes
Feb 3, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
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.
Prep for #935