Skip to content

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

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

Merged
merged 1 commit into from
Jul 8, 2025
Merged

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

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
56 changes: 28 additions & 28 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.

8 changes: 3 additions & 5 deletions blockdev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion mount/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion ostree-ext/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion system-reinstall-bootc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion sysusers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion tmpfiles/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bootc-utils"
publish = false
name = "bootc-internal-utils"
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Clarify the purpose of this crate with a more descriptive description, as this crate is now internal.

description = "Internal implementation component of bootc; do not use"

description = "Internal implementation component of bootc; do not use"
version = "0.0.0"
edition = "2021"
license = "MIT OR Apache-2.0"
Expand Down