build-sys: Move all common deps to workspace

General cleanup.

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

Cargo.toml

@@ -60,6 +60,13 @@ tracing = "0.1.40"
 thiserror = "2.0.11"
 tokio = ">= 1.37.0"
 tokio-util = { features = ["io-util"], version = "0.7.10" }
+regex = "1.10.4"
+uzers = "0.12"
+shlex = "1.3"
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+toml = "0.9.5"
+xshell = "0.2.6"
+log = "0.4.21"
 
 # See https://github.com/coreos/cargo-vendor-filterer
 [workspace.metadata.vendor-filter]

crates/blockdev/Cargo.toml

@@ -12,7 +12,7 @@ bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "
 camino = { workspace = true, features = ["serde1"] }
 fn-error-context = { workspace = true }
 libc = { workspace = true }
-regex = "1.10.4"
+regex = { workspace = true }
 rustix = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
@@ -21,7 +21,7 @@ tokio = { workspace = true, features = ["signal"] }
 tracing = { workspace = true }
 
 [dev-dependencies]
-indoc = "2.0.5"
+indoc = { workspace = true }
 
 [lib]
 path = "src/blockdev.rs"

crates/cli/Cargo.toml

@@ -19,7 +19,7 @@ anyhow = { workspace = true }
 bootc-lib = { version = "1.6", path = "../lib" }
 bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
 tokio = { workspace = true, features = ["macros"] }
-log = "0.4.21"
+log = { workspace = true }
 owo-colors = { workspace = true }
 tracing = { workspace = true }
 

crates/lib/Cargo.toml

@@ -14,7 +14,7 @@ rust-version = "1.82.0"
 include = ["/src", "LICENSE-APACHE", "LICENSE-MIT"]
 
 [dependencies]
-anstream = "0.6.13"
+anstream = { workspace = true }
 anstyle = "1.0.6"
 anyhow = { workspace = true }
 bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
@@ -41,7 +41,7 @@ liboverdrop = "0.1.0"
 libsystemd = "0.7"
 linkme = "0.3"
 openssl = { workspace = true }
-regex = "1.10.4"
+regex = { workspace = true }
 rustix = { workspace = true }
 schemars = { version = "1.0.4", features = ["chrono04"] }
 serde = { workspace = true, features = ["derive"] }
@@ -52,8 +52,8 @@ tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"
 tokio-util = { workspace = true }
 tracing = { workspace = true }
 tempfile = { workspace = true }
-toml = "0.9.5"
-xshell = { version = "0.2.6", optional = true }
+toml = { workspace = true }
+xshell = { workspace = true, optional = true }
 uuid = { version = "1.8.0", features = ["v4"] }
 tini = "1.3.0"
 comfy-table = "7.1.1"

crates/mount/Cargo.toml

@@ -19,7 +19,7 @@ serde = { workspace = true, features = ["derive"] }
 tracing = { workspace = true }
 
 [dev-dependencies]
-indoc = "2.0.5"
+indoc = { workspace = true }
 
 [lib]
 path = "src/mount.rs"

crates/ostree-ext/Cargo.toml

@@ -36,7 +36,7 @@ libsystemd = "0.7.0"
 openssl = { workspace = true }
 ocidir = "0.4.0"
 pin-project = "1.0"
-regex = "1.5.4"
+regex = { workspace = true }
 rustix = { workspace = true, features = ["fs", "process"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
@@ -45,7 +45,7 @@ tempfile = { workspace = true }
 tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"] }
 tokio-util = { workspace = true }
 tokio-stream = { features = ["sync"], version = "0.1.8" }
-tracing = "0.1"
+tracing = { workspace = true }
 zstd = { version = "0.13.1", features = ["pkg-config"] }
 indexmap = { version = "2.2.2", features = ["serde"] }
 

crates/system-reinstall-bootc/Cargo.toml

@@ -21,15 +21,15 @@ clap = { workspace = true, features = ["derive"] }
 crossterm = "0.29.0"
 dialoguer = "0.11.0"
 indoc = { workspace = true }
-log = "0.4.21"
+log = { workspace = true }
 openssh-keys = "0.6.4"
 rustix = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 serde_yaml = "0.9.22"
 tempfile = { workspace = true }
 tracing = { workspace = true }
-uzers = "0.12.1"
+uzers = { workspace = true }
 which = "8.0.0"
 
 [lints]

crates/sysusers/Cargo.toml

@@ -9,13 +9,13 @@ publish = false
 anyhow = { workspace = true }
 camino = { workspace = true }
 fn-error-context = { workspace = true }
-cap-std-ext = { version = "4", features = ["fs_utf8"] }
-hex = "0.4"
+cap-std-ext = { workspace = true, features = ["fs_utf8"] }
+hex = { workspace = true }
 thiserror = { workspace = true }
 tempfile = { workspace = true }
 bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
 rustix = { workspace = true }
-uzers = "0.12"
+uzers = { workspace = true }
 
 [dev-dependencies]
 indoc = { workspace = true }

crates/tests-integration/Cargo.toml

@@ -24,7 +24,7 @@ rustix = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 tempfile = { workspace = true }
-xshell = { version = "0.2.6" }
+xshell = { workspace = true }
 
 [lints]
 workspace = true

crates/tmpfiles/Cargo.toml

@@ -8,12 +8,12 @@ publish = false
 [dependencies]
 camino = { workspace = true }
 fn-error-context = { workspace = true }
-cap-std-ext = { version = "4" }
+cap-std-ext = { workspace = true }
 thiserror = { workspace = true }
 tempfile = { workspace = true }
 bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
 rustix = { workspace = true }
-uzers = "0.12"
+uzers = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true }