mkosi: Drop _fixperms workaround

This was added to deal with a bug in the rpm 4.20 rc in Rawhide
but since that's been fixed, let's drop the workaround.

(cherry picked from commit 517e8922101557fccf4a7f8fc922e5102e787ec7)

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 466699c4fdc6cd464a6e434341d5b445d2b2be42..802c2330efa504b928d04365e82194b9fe7008de 100755 (executable)
--- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot
+++ b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.build.chroot
@@ -100,7 +100,6 @@ CXX_LD="$( ((LLVM)) && echo lld)" \
     --define "__script_requires %{nil}" \
     --define "_find_debuginfo_opts --unique-debug-src-base \"%{name}\"" \
     --define "_find_debuginfo_dwz_opts %{nil}" \
-    --define "_fixperms true" \
     --undefine _package_note_flags \
     --noclean \
     "pkg/$PKG_SUBDIR/systemd.spec"

diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
index a1fb83cdd9320a5ebfd8938488d025db63567710..adca7d3b27cf5b10df5a8e6b93881d0f75562d4c 100755 (executable)
--- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
+++ b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
@@ -97,7 +97,6 @@ build() {
         --define "__script_requires %{nil}" \
         --define "_find_debuginfo_dwz_opts %{nil}" \
         --define "_find_debuginfo_opts --unique-debug-src-base \"%{name}\"" \
-        --define "_fixperms true" \
         --noclean \
         "$@" \
         "pkg/$PKG_SUBDIR/systemd.spec"