Merge pull request #1394 from cgwalters/publish-internals

Rework utils and blockdev crates as -internals in prep for publishing

Author: cgwalters

Cargo.lock

@@ -1,16 +1,14 @@
 [package]
-description = "Internal blockdev code"
-# Should never be published to crates.io
-publish = false
+description = "Internal implementation component of bootc; do not use"
 edition = "2021"
 license = "MIT OR Apache-2.0"
-name = "bootc-blockdev"
+name = "bootc-internal-blockdev"
 repository = "https://github.com/bootc-dev/bootc"
 version = "0.0.0"
 
 [dependencies]
 anyhow = { workspace = true }
-bootc-utils = { path = "../utils" }
+bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
 camino = { workspace = true, features = ["serde1"] }
 fn-error-context = { workspace = true }
 regex = "1.10.4"

blockdev/Cargo.toml

@@ -18,7 +18,7 @@ platforms = ["*-unknown-linux-gnu"]
 anstream = { workspace = true }
 anyhow = { workspace = true }
 bootc-lib = { version = "1.0", path = "../lib" }
-bootc-utils = { path = "../utils" }
+bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
 tokio = { workspace = true, features = ["macros"] }
 log = "0.4.21"
 owo-colors = { workspace = true }

cli/Cargo.toml

@@ -18,8 +18,8 @@ include = ["/src", "LICENSE-APACHE", "LICENSE-MIT"]
 anstream = "0.6.13"
 anstyle = "1.0.6"
 anyhow = { workspace = true }
-bootc-utils = { path = "../utils" }
-bootc-blockdev = { path = "../blockdev" }
+bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
+bootc-blockdev = { package = "bootc-internal-blockdev", path = "../blockdev", version = "0.0.0" }
 bootc-mount = { path = "../mount" }
 bootc-tmpfiles = { path = "../tmpfiles" }
 bootc-sysusers = { path = "../sysusers" }

lib/Cargo.toml

@@ -10,7 +10,7 @@ version = "0.0.0"
 
 [dependencies]
 anyhow = { workspace = true }
-bootc-utils = { path = "../utils" }
+bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
 camino = { workspace = true, features = ["serde1"] }
 fn-error-context = { workspace = true }
 rustix = { workspace = true }

mount/Cargo.toml

@@ -15,7 +15,7 @@ ostree = { features = ["v2025_2"], version = "0.20" }
 
 # Private dependencies
 anyhow = { workspace = true }
-bootc-utils = { path = "../utils" }
+bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
 camino = { workspace = true, features = ["serde1"] }
 composefs = { git = "https://github.com/containers/composefs-rs", rev = "821eeae93e48f1ee381c49b8cd4d22fda92d27a2" }
 chrono = { workspace = true }

ostree-ext/Cargo.toml

@@ -17,7 +17,7 @@ platforms = ["*-unknown-linux-gnu"]
 [dependencies]
 anyhow = { workspace = true }
 bootc-mount = { path = "../mount" }
-bootc-utils = { path = "../utils" }
+bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
 clap = { workspace = true, features = ["derive"] }
 crossterm = "0.29.0"
 dialoguer = "0.11.0"

system-reinstall-bootc/Cargo.toml

@@ -13,7 +13,7 @@ cap-std-ext = { version = "4", features = ["fs_utf8"] }
 hex = "0.4"
 thiserror = { workspace = true }
 tempfile = { workspace = true }
-bootc-utils = { path = "../utils" }
+bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
 rustix = { workspace = true }
 uzers = "0.12"
 

sysusers/Cargo.toml

@@ -11,7 +11,7 @@ fn-error-context = { workspace = true }
 cap-std-ext = { version = "4" }
 thiserror = { workspace = true }
 tempfile = { workspace = true }
-bootc-utils = { path = "../utils" }
+bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
 rustix = { workspace = true }
 uzers = "0.12"
 

tmpfiles/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "bootc-utils"
-publish = false
+name = "bootc-internal-utils"
+description = "Internal implementation component of bootc; do not use"
 version = "0.0.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"