Skip to content
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.

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

build_packages: fix systemd cyclic deps resolver #1288

Merged
merged 1 commit into from
Oct 19, 2023

Conversation

t-lo
Copy link
Member

@t-lo t-lo commented Oct 19, 2023

This change removes "curl" from the USE flags to be removed to build systemd in the cyclic deps resolver step of build_packages. Excluding curl from systemd's USE flags leads to build breakage:

09:06:25  !!! The ebuild selected to satisfy "sys-apps/systemd" for /build/amd64-usr/ has unmet requirements. 09:06:25  - sys-apps/systemd-252.11-r1::coreos USE="audit dns-over-tls elfutils gcrypt gnuefi http idn importd iptables kmod lz4 lzma openssl pam pcre policykit resolvconf seccomp selinux (sysv-utils) (vanilla) zstd -acl -apparmor -cgroup-hybrid -cryptsetup -curl -fido2 -gnutls -homed -pkcs11 -pwquality -qrcode (-split-usr) -test -tpm -xkb" 09:06:25
09:06:25    The following REQUIRED_USE flag constraints are unsatisfied:
09:06:25      importd? ( curl )
09:06:25
09:06:25    The above constraints are a subset of the following complete expression:
09:06:25      dns-over-tls? ( any-of ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma any-of ( gcrypt openssl ) ) pwquality? ( homed )

This change removes "curl" from the USE flags to be removed to build
systemd in the cyclic deps resolver step of build_packages. Excluding
curl from systemd's USE flags leads to build breakage:

09:06:25  !!! The ebuild selected to satisfy "sys-apps/systemd" for /build/amd64-usr/ has unmet requirements.
09:06:25  - sys-apps/systemd-252.11-r1::coreos USE="audit dns-over-tls elfutils gcrypt gnuefi http idn importd iptables kmod lz4 lzma openssl pam pcre policykit resolvconf seccomp selinux (sysv-utils) (vanilla) zstd -acl -apparmor -cgroup-hybrid -cryptsetup -curl -fido2 -gnutls -homed -pkcs11 -pwquality -qrcode (-split-usr) -test -tpm -xkb"
09:06:25
09:06:25    The following REQUIRED_USE flag constraints are unsatisfied:
09:06:25      importd? ( curl )
09:06:25
09:06:25    The above constraints are a subset of the following complete expression:
09:06:25      dns-over-tls? ( any-of ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma any-of ( gcrypt openssl ) ) pwquality? ( homed )

Signed-off-by: Thilo Fromm <thilofromm@microsoft.com>
@@ -276,7 +276,7 @@ if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_FALSE}" ]]; then
break_dep_loop sys-apps/util-linux udev,systemd,cryptsetup \
sys-fs/cryptsetup udev \
sys-fs/lvm2 udev,systemd \
sys-apps/systemd cryptsetup,curl \
sys-apps/systemd cryptsetup \
Copy link
Member

Choose a reason for hiding this comment

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

Instead of dropping curl, please add importd. That something I did in the build tag, but forgot to put it into the PR branch (6e20bf3)

Copy link
Member Author

Choose a reason for hiding this comment

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

As discussed on Matrix, there's no difference in overall packages built...

@t-lo t-lo merged commit e818798 into main Oct 19, 2023
1 check failed
@t-lo t-lo deleted the t-lo/fix-systemd-curl-cyclic-dep branch October 19, 2023 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants