Skip to content

packaging/rpm: Be sure we pull in chcon (and util-linux) #1391

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 2 commits into from
Jun 30, 2025
Merged

packaging/rpm: Be sure we pull in chcon (and util-linux) #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0da9609
cli: Drop version to zero; canonical is in lib/
cgwalters Jun 30, 2025
b86be3d
packaging/rpm: Be sure we pull in chcon (and util-linux)
cgwalters Jun 30, 2025
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ exclude-crate-paths = [ { name = "libz-sys", exclude = "src/zlib" },
# This is an made up key for external binary dependencies.
# setpriv is a proxy for util-linux, and systemctl is a proxy for systemd.
[workspace.metadata.binary-dependencies]
bins = ["skopeo", "podman", "ostree", "zstd", "setpriv", "systemctl"]
bins = ["skopeo", "podman", "ostree", "zstd", "setpriv", "systemctl", "chcon"]

[workspace.lints.rust]
# Require an extra opt-in for unsafe
Expand Down
3 changes: 2 additions & 1 deletion cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "bootc"
version = "0.1.9"
# This is a stub, the real version is from the lib crate
version = "0.0.0"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/bootc-dev/bootc"
Expand Down
5 changes: 4 additions & 1 deletion contrib/packaging/bootc.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,13 @@ BuildRequires: skopeo ostree

# Backing storage tooling https://github.com/containers/composefs/issues/125
Requires: composefs
# For OS updates
# Keep this list in sync with workspace.metadata.binary-dependencies until we sync
# it automatically
Requires: ostree
Requires: skopeo
Requires: podman
Requires: util-linux-core
Requires: /usr/bin/chcon
Comment on lines +55 to +56
Copy link

Choose a reason for hiding this comment

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

medium

Thanks for adding these dependencies. The new comment on lines 50-51 about keeping this in sync with workspace.metadata.binary-dependencies is very helpful.

Following that comment, I checked Cargo.toml and noticed zstd and systemctl are also listed as binary dependencies. To make the spec file fully consistent, we should probably add Requires for them as well. I've suggested adding file-path based Requires for them to be consistent with the addition of /usr/bin/chcon.

Requires: util-linux-core
Requires: /usr/bin/chcon
Requires: /usr/bin/systemctl
Requires: /usr/bin/zstd

# For bootloader updates
Recommends: bootupd

Expand Down
Loading