Skip to content
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.

Sign up for GitHub

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

Use ostree-ext from bootc #5227

Merged
merged 1 commit into from
Jan 16, 2025
Merged

Use ostree-ext from bootc #5227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 94 additions & 13 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ nix = { version = "0.29.0", features = ["fs", "mount", "signal", "user"] }
openssl = "0.10.68"
once_cell = "1.20.2"
os-release = "0.1.0"
ostree-ext = "0.15"
# We pull this one from git, as the project is no longer published as an external crate.
ostree-ext = { git = "https://github.com/containers/bootc", rev = "dc7d4cf320ec6d8b2470d1d5f76da66ec60b6810" }
paste = "1.0"
phf = { version = "0.11", features = ["macros"] }
rand = "0.8.5"
Expand Down
2 changes: 1 addition & 1 deletion deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ name = "ring"
[sources]
unknown-registry = "deny"
unknown-git = "deny"
allow-git = []
allow-git = ["https://github.com/containers/bootc"]
2 changes: 2 additions & 0 deletions packaging/rpm-ostree.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ export RUSTFLAGS="%{build_rustflags}"
%cargo_license_summary
%{cargo_license} > LICENSE.dependencies
%cargo_vendor_manifest
# https://pagure.io/fedora-rust/rust-packaging/issue/33
sed -i -e '/https:\/\//d' cargo-vendor.txt
%endif

%install
Expand Down
5 changes: 1 addition & 4 deletions rust/src/sysroot_upgrade.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,7 @@ async fn pull_container_async(
};
let digest = prep.manifest_digest.clone();
output_message(&format!("Importing: {} (digest: {})", &imgref, &digest));
let ostree_layers = prep
.ostree_layers
.iter()
.chain(std::iter::once(&prep.ostree_commit_layer));
let ostree_layers = prep.ostree_layers.iter().chain(&prep.ostree_commit_layer);
let mut total_to_fetch = 0;
let (stored, (n_to_fetch, size_to_fetch)) = layer_counts(ostree_layers);
if stored > 0 {
Expand Down
Loading