Merge pull request #5227 from cgwalters/use-bootc-ostree-ext-git

Cargo.toml

@@ -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"

deny.toml

@@ -12,4 +12,4 @@ name = "ring"
 [sources]
 unknown-registry = "deny"
 unknown-git = "deny"
-allow-git = []
+allow-git = ["https://github.com/containers/bootc"]

packaging/rpm-ostree.spec

@@ -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

rust/src/sysroot_upgrade.rs

@@ -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 {