diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-16 18:28:34 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-16 18:28:34 +0000 |
| commit | 39bea55b2de0eabc2a876ed40dd664d1f80cbcd2 (patch) | |
| tree | 440d70559330bcdfe14968d44dd5d33ea570281e /mkosi.conf.d/10-centos-fedora/mkosi.prepare | |
| parent | Releasing progress-linux version 256.5-2~progress7.99u1. (diff) | |
| download | systemd-39bea55b2de0eabc2a876ed40dd664d1f80cbcd2.tar.xz systemd-39bea55b2de0eabc2a876ed40dd664d1f80cbcd2.zip | |
Merging upstream version 256.6.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mkosi.conf.d/10-centos-fedora/mkosi.prepare')
| -rwxr-xr-x | mkosi.conf.d/10-centos-fedora/mkosi.prepare | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.prepare b/mkosi.conf.d/10-centos-fedora/mkosi.prepare index 2a890bc..9aca009 100755 --- a/mkosi.conf.d/10-centos-fedora/mkosi.prepare +++ b/mkosi.conf.d/10-centos-fedora/mkosi.prepare @@ -11,9 +11,9 @@ mapfile -t PACKAGES < <(jq --raw-output .VolatilePackages[] <"$MKOSI_CONFIG") for DEPS in --requires --recommends --suggests; do # We need --latest-limit=1 to only consider the newest version of the packages. # --latest-limit=1 is per <name>.<arch> so we have to pass --arch= explicitly to make sure i686 packages - # are not considerd on x86-64. - dnf repoquery --arch="$DISTRIBUTION_ARCHITECTURE" --latest-limit=1 --quiet "$DEPS" "${PACKAGES[@]}" | - grep --invert-match --regexp systemd --regexp udev --regexp /bin/sh --regexp grubby --regexp sdubby --regexp libcurl-minimal | + # are not considered on x86-64. + dnf repoquery --arch="$DISTRIBUTION_ARCHITECTURE,noarch" --latest-limit=1 --quiet "$DEPS" "${PACKAGES[@]}" | + grep --extended-regexp --invert-match --regexp "$(IFS=\| ; echo "${PACKAGES[*]}")" --regexp /bin/sh --regexp grubby --regexp sdubby --regexp libcurl-minimal | sort --unique | xargs --delimiter '\n' --no-run-if-empty mkosi-install done |