Skip to content

Commit f9cb9e4

Browse files
authored
Merge pull request #1409 from cgwalters/use-rustix-libc
Bump composefs-rs and use-libc for rustix
2 parents c8e7a68 + ae86fbd commit f9cb9e4

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ fn-error-context = "0.2.1"
5858
libc = "0.2.154"
5959
openssl = "0.10.72"
6060
owo-colors = { version = "4" }
61-
rustix = { "version" = "1", features = ["thread", "net", "fs", "system", "process", "mount"] }
61+
# For the same rationale as https://github.com/coreos/rpm-ostree/commit/27f3f4b77a15f6026f7e1da260408d42ccb657b3
62+
rustix = { "version" = "1", features = ["use-libc", "thread", "net", "fs", "system", "process", "mount"] }
6263
serde = "1.0.199"
6364
serde_json = "1.0.116"
6465
similar-asserts = "1.5.0"

ostree-ext/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ostree = { features = ["v2025_2"], version = "0.20" }
1717
anyhow = { workspace = true }
1818
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
1919
camino = { workspace = true, features = ["serde1"] }
20-
composefs = { git = "https://github.com/containers/composefs-rs", rev = "59299eb8de6c22410f32213cc57901a7ddd3c134", features = ["rhel9"] }
20+
composefs = { git = "https://github.com/containers/composefs-rs", rev = "d5455222f282200913902f29c66d5f625ca5661f", features = ["rhel9"] }
2121
chrono = { workspace = true }
2222
clap = { workspace = true, features = ["derive","cargo"] }
2323
clap_mangen = { workspace = true, optional = true }

0 commit comments

Comments
 (0)