From 4eae2be0d7cd8832688d38ef2cdf4a42578fbff0 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 5 Sep 2024 18:38:33 +0200 Subject: [PATCH 1/2] mkosi: Install util-linux-script on Rawhide It's now subpackaged so we can build images without pulling in libutempter but we use script in the testsuite so let's install the subpackage. --- mkosi.conf.d/10-fedora/mkosi.conf.d/rawhide.conf | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 mkosi.conf.d/10-fedora/mkosi.conf.d/rawhide.conf diff --git a/mkosi.conf.d/10-fedora/mkosi.conf.d/rawhide.conf b/mkosi.conf.d/10-fedora/mkosi.conf.d/rawhide.conf new file mode 100644 index 00000000000..f657b3dca4d --- /dev/null +++ b/mkosi.conf.d/10-fedora/mkosi.conf.d/rawhide.conf @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Release=rawhide + +[Content] +Packages=util-linux-script From 31e7a3748054071438d0fa8737fc9ee349d04019 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 5 Sep 2024 18:45:52 +0200 Subject: [PATCH 2/2] mkosi: Remove rpm workaround rpm 4.19.93 (4.20 rc) is in rawhide so let's drop the workaround. --- .../build/mkosi.conf.d/centos-fedora/mkosi.build.chroot | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot index a790a8c0833..7c744ca1abd 100755 --- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot +++ b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot @@ -53,12 +53,6 @@ if ((WIPE)) && [[ -d "$BUILDDIR/meson-private" ]]; then MKOSI_MESON_OPTIONS="$MKOSI_MESON_OPTIONS --wipe" fi -# Hack to work around https://github.com/rpm-software-management/rpm/issues/3216. -# TODO: Remove when rpm 4.20 gets into Rawhide. -mkdir -p "/var/tmp/BUILD/systemd-${VERSION/\~/_}-build" -mkdir -p "/var/tmp/BUILD/systemd-${VERSION/\~/_}-build/SPECPARTS" -ln -s /work/src "/var/tmp/BUILD/systemd-${VERSION/\~/_}-build/systemd-$VERSION" - IFS= # TODO: Replace meson_build and meson_install overrides with "--undefine __meson_verbose" once # https://github.com/mesonbuild/meson/pull/12835 is available.