Update to latest composefs-rs

Using the new "single export from cfsctl" simplifies our Cargo.toml
because we no longer need to reference the same git hash 3-4 times.

Signed-off-by: Colin Walters <walters@verbum.org>

Author: cgwalters

Cargo.lock

@@ -40,19 +40,11 @@ cfg-if = "1.0"
 chrono = { version = "0.4.38", default-features = false }
 clap = "4.5.4"
 clap_mangen = { version = "0.2.20" }
-# Reviewers (including AI tools): The composefs-rs git revision is duplicated for each crate.
-# If adding/removing crates here, also update docs/Dockerfile.mdbook and docs/src/internals.md.
-#
 # To develop against a local composefs-rs checkout, add a [patch] section at the end of this file:
-#   [patch."https://github.com/containers/composefs-rs"]
-#   composefs = { path = "/home/user/src/composefs-rs/crates/composefs" }
-#   composefs-boot = { path = "/home/user/src/composefs-rs/crates/composefs-boot" }
-#   composefs-oci = { path = "/home/user/src/composefs-rs/crates/composefs-oci" }
+#   [patch."https://github.com/composefs/composefs-rs"]
+#   cfsctl = { path = "/path/to/composefs-rs/crates/cfsctl" }
 # The Justfile will auto-detect these and bind-mount them into container builds.
-composefs = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "composefs", features = ["rhel9"] }
-cfsctl = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "cfsctl", features = ["rhel9"] }
-composefs-boot = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "composefs-boot" }
-composefs-oci = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "composefs-oci" }
+cfsctl = { git = "https://github.com/composefs/composefs-rs", rev = "2203e8f", package = "cfsctl", features = ["rhel9"] }
 fn-error-context = "0.2.1"
 hex = "0.4.3"
 indicatif = "0.18.0"

Cargo.toml

@@ -12,7 +12,7 @@ rustix = { workspace = true }
 openssl = { workspace = true }
 hex = { workspace = true }
 tracing = { workspace = true }
-composefs = { workspace = true }
+cfsctl = { workspace = true }
 fn-error-context = { workspace = true }
 owo-colors = { workspace = true }
 anstream = { workspace = true }

crates/etc-merge/Cargo.toml

@@ -17,6 +17,7 @@ use anyhow::Context;
 use cap_std_ext::cap_std;
 use cap_std_ext::cap_std::fs::{Dir as CapStdDir, MetadataExt, Permissions, PermissionsExt};
 use cap_std_ext::dirext::CapStdExtDirExt;
+use cfsctl::composefs;
 use composefs::fsverity::{FsVerityHashValue, Sha256HashValue, Sha512HashValue};
 use composefs::generic_tree::{Directory, Inode, Leaf, LeafContent, Stat};
 use composefs::tree::ImageError;

crates/etc-merge/src/lib.rs

@@ -11,8 +11,7 @@ clap = { workspace = true, features = ["std", "help", "usage", "derive"] }
 libc.workspace = true
 rustix.workspace = true
 serde = { workspace = true, features = ["derive"] }
-composefs.workspace = true
-composefs-boot.workspace = true
+cfsctl.workspace = true
 toml.workspace = true
 fn-error-context.workspace = true
 bootc-kernel-cmdline =  { path = "../kernel_cmdline", version = "0.0.0" }
@@ -22,5 +21,5 @@ workspace = true
 
 [features]
 default = ['pre-6.15']
-rhel9 = ['composefs/rhel9']
-'pre-6.15' = ['composefs/pre-6.15']
+rhel9 = ['cfsctl/rhel9']
+'pre-6.15' = ['cfsctl/pre-6.15']

crates/initramfs/Cargo.toml

@@ -21,6 +21,8 @@ use rustix::{
 };
 use serde::Deserialize;
 
+use cfsctl::composefs;
+use cfsctl::composefs_boot;
 use composefs::{
     fsverity::{FsVerityHashValue, Sha512HashValue},
     mount::FsHandle,

crates/initramfs/src/lib.rs

@@ -35,10 +35,7 @@ chrono = { workspace = true, features = ["serde"] }
 clap = { workspace = true, features = ["derive","cargo"] }
 clap_complete = "4"
 clap_mangen = { workspace = true, optional = true }
-composefs = { workspace = true }
 cfsctl = { workspace = true }
-composefs-boot = { workspace = true }
-composefs-oci = { workspace = true }
 fn-error-context = { workspace = true }
 hex = { workspace = true }
 indicatif = { workspace = true }

crates/lib/Cargo.toml

@@ -74,19 +74,21 @@ use cap_std_ext::{
     cap_std::{ambient_authority, fs::Dir},
     dirext::CapStdExtDirExt,
 };
+use cfsctl::composefs;
+use cfsctl::composefs_boot;
+use cfsctl::composefs_oci;
 use clap::ValueEnum;
 use composefs::fs::read_file;
+use composefs::fsverity::{FsVerityHashValue, Sha512HashValue};
 use composefs::tree::RegularFile;
 use composefs_boot::BootOps;
-use composefs_boot::bootloader::{EFI_ADDON_DIR_EXT, EFI_ADDON_FILE_EXT, EFI_EXT, PEType};
-use fn_error_context::context;
-use ostree_ext::composefs::fsverity::{FsVerityHashValue, Sha512HashValue};
-use ostree_ext::composefs_boot::bootloader::UsrLibModulesVmlinuz;
-use ostree_ext::composefs_boot::{
-    bootloader::BootEntry as ComposefsBootEntry, cmdline::get_cmdline_composefs,
-    os_release::OsReleaseInfo, uki,
+use composefs_boot::bootloader::{
+    BootEntry as ComposefsBootEntry, EFI_ADDON_DIR_EXT, EFI_ADDON_FILE_EXT, EFI_EXT, PEType,
+    UsrLibModulesVmlinuz,
 };
-use ostree_ext::composefs_oci::image::create_filesystem as create_composefs_filesystem;
+use composefs_boot::{cmdline::get_cmdline_composefs, os_release::OsReleaseInfo, uki};
+use composefs_oci::image::create_filesystem as create_composefs_filesystem;
+use fn_error_context::context;
 use rustix::{mount::MountFlags, path::Arg};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -333,10 +335,10 @@ fn compute_boot_digest(
 /// * repo - The composefs repository
 #[context("Computing boot digest")]
 pub(crate) fn compute_boot_digest_uki(uki: &[u8]) -> Result<String> {
-    let vmlinuz = composefs_boot::uki::get_section(uki, ".linux")
-        .ok_or_else(|| anyhow::anyhow!(".linux not present"))??;
+    let vmlinuz =
+        uki::get_section(uki, ".linux").ok_or_else(|| anyhow::anyhow!(".linux not present"))??;
 
-    let initramfs = composefs_boot::uki::get_section(uki, ".initrd")
+    let initramfs = uki::get_section(uki, ".initrd")
         .ok_or_else(|| anyhow::anyhow!(".initrd not present"))??;
 
     let mut hasher = openssl::hash::Hasher::new(openssl::hash::MessageDigest::sha256())

crates/lib/src/bootc_composefs/boot.rs

@@ -8,6 +8,8 @@ use anyhow::{Context, Result};
 use camino::Utf8Path;
 use cap_std_ext::cap_std;
 use cap_std_ext::cap_std::fs::Dir;
+use cfsctl::composefs;
+use cfsctl::composefs_boot;
 use composefs::dumpfile;
 use composefs::fsverity::FsVerityHashValue;
 use composefs_boot::BootOps as _;

crates/lib/src/bootc_composefs/digest.rs

@@ -2,6 +2,8 @@ use std::{fs::File, os::fd::AsRawFd};
 
 use anyhow::{Context, Result};
 use cap_std_ext::cap_std::{ambient_authority, fs::Dir};
+use cfsctl::composefs;
+use cfsctl::composefs_oci;
 use composefs::splitstream::SplitStreamData;
 use composefs_oci::open_config;
 use ocidir::{OciDir, oci_spec::image::Platform};