Skip to content

Commit c54bbad

Browse files
committed
build_packages: Break a new circular dependency
Looks like enabling sssd in sys-auth/pambase created a new cycle: sys-auth/pambase[sssd] -> sys-auth/sssd -> sys-apps/shadow[pam] -> sys-auth/pambase Let's break it up at pambase. Also fix a mistake in a comment and sort the USE flags alphabetically. Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
1 parent ddc3930 commit c54bbad

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

build_packages

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,16 +269,18 @@ if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_FALSE}" ]]; then
269269
# systemd[cryptsetup] -> cryptsetup[udev] -> virtual/udev -> systemd
270270
# systemd[tpm] -> tpm2-tss -> util-linux[udev] -> virtual/udev -> systemd
271271
# curl[http2] -> nghttp2[systemd] -> systemd[curl] -> curl
272-
# sys-libs/pam[systemd] -> sys-apps/system[pam] -> sys-libs/pam
273-
# not dropping pam from sys-apps/systemd, otherwise we would need
274-
# to drop pam from sys-auth/pambase
275-
break_dep_loop sys-apps/util-linux udev,systemd,cryptsetup \
272+
# sys-libs/pam[systemd] -> sys-apps/systemd[pam] -> sys-libs/pam
273+
# dropping USE=pam from sys-apps/systemd requires dropping
274+
# USE=systemd from sys-auth/pambase
275+
# sys-auth/pambase[sssd] -> sys-auth/sssd -> sys-apps/shadow[pam] -> sys-auth/pambase
276+
break_dep_loop sys-apps/util-linux cryptsetup,systemd,udev \
276277
sys-fs/cryptsetup udev \
277-
sys-fs/lvm2 udev,systemd \
278-
sys-apps/systemd cryptsetup,tpm \
278+
sys-fs/lvm2 systemd,udev \
279+
sys-apps/systemd cryptsetup,pam,tpm \
279280
net-misc/curl http2 \
280281
net-libs/nghttp2 systemd \
281-
sys-libs/pam systemd
282+
sys-libs/pam systemd \
283+
sys-auth/pambase sssd,systemd
282284
fi
283285

284286
if [[ "${FLAGS_only_resolve_circular_deps}" -eq "${FLAGS_TRUE}" ]]; then

0 commit comments

Comments
 (0)