diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-09-05 18:45:52 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-09-05 18:45:52 +0200 |
| commit | 31e7a3748054071438d0fa8737fc9ee349d04019 (patch) | |
| tree | 5d2418be99a02dc0738f2827dd68cee0b837d4a4 | |
| parent | mkosi: Install util-linux-script on Rawhide (diff) | |
| download | systemd-31e7a3748054071438d0fa8737fc9ee349d04019.tar.xz systemd-31e7a3748054071438d0fa8737fc9ee349d04019.zip | |
mkosi: Remove rpm workaround
rpm 4.19.93 (4.20 rc) is in rawhide so let's drop the workaround.
| -rwxr-xr-x | mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot | 6 |
1 files changed, 0 insertions, 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 a790a8c083..7c744ca1ab 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. |