]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: Remove rpm workaround 34267/head
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 5 Sep 2024 16:45:52 +0000 (18:45 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 5 Sep 2024 16:45:52 +0000 (18:45 +0200)
rpm 4.19.93 (4.20 rc) is in rawhide so let's drop the workaround.

mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot

index a790a8c08338944ca44a2f37f37e49e35434348d..7c744ca1abd95f626b9638a981957b75c6ef2ae5 100755 (executable)
@@ -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.