Skip to content

Commit d608932

Browse files
daandemeyerpull[bot]
authored andcommitted
mkosi: Make path exclude more generic
The systemd rpms we try to install in packit have /usr/bin/bash and /usr/bin/python3 as dependencies which breaks dnf5 because mkosi doesn't download filelists metadata and https://bugzilla.redhat.com/show_bug.cgi?id=2263771 is still not fixed almost a year after being reported.
1 parent 5f554bd commit d608932

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

mkosi.conf.d/10-centos-fedora/mkosi.prepare

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ for DEPS in --requires --recommends --suggests; do
1212
# We need --latest-limit=1 to only consider the newest version of the packages.
1313
# --latest-limit=1 is per <name>.<arch> so we have to pass --arch= explicitly to make sure i686 packages
1414
# are not considered on x86-64.
15+
# Because mkosi does not download the filelists repository metadata, we have to exclude all path based
16+
# dependencies, (even those within /usr and /bin because of
17+
# https://bugzilla.redhat.com/show_bug.cgi?id=2263771).
1518
dnf repoquery --arch="$DISTRIBUTION_ARCHITECTURE,noarch" --latest-limit=1 --quiet "$DEPS" "${PACKAGES[@]}" |
16-
grep --extended-regexp --invert-match --regexp "$(IFS=\| ; echo "${PACKAGES[*]}")" --regexp /bin/sh --regexp grubby --regexp sdubby --regexp libcurl-minimal |
19+
grep --extended-regexp --invert-match --regexp "$(IFS=\| ; echo "${PACKAGES[*]}")" --regexp /bin --regexp /usr --regexp grubby --regexp sdubby --regexp libcurl-minimal |
1720
sort --unique |
1821
xargs --delimiter '\n' --no-run-if-empty mkosi-install
1922
done

0 commit comments

Comments
 (0)