From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 5 Sep 2024 16:45:52 +0000 (+0200)
Subject: mkosi: Remove rpm workaround
X-Git-Tag: v257-rc1~545^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F34267%2Fhead;p=thirdparty%2Fsystemd.git

mkosi: Remove rpm workaround

rpm 4.19.93 (4.20 rc) is in rawhide so let's drop the workaround.
---

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.