From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 30 May 2024 20:19:00 +0000 (+0200)
Subject: mkosi: Override rpm's _fixperms script to be a noop
X-Git-Tag: v256-rc4~73^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1baea8628775da6b7713863a30381ddb0101e36d;p=thirdparty%2Fsystemd.git

mkosi: Override rpm's _fixperms script to be a noop

Since rpm 4.20 it tries to fix the permissions of all source files
in the sources. This takes forever and fails in our case with a
permission error. Since we don't want rpm touching our source files,
override the script to be a noop.
---

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
index 3a09f00c25a..7618f07839e 100755
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
@@ -77,6 +77,7 @@ ANNOBIN="no-active-checks" rpmbuild \
     --define "__script_requires %{nil}" \
     --define "_find_debuginfo_dwz_opts %{nil}" \
     --define "_fortify_level 0" \
+    --define "_fixperms true" \
     --undefine _lto_cflags \
     --undefine _package_note_flags \
     --noclean \
diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
index e7f586cf8b8..b2c56fda776 100755
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
@@ -76,6 +76,7 @@ build() {
         --define "__elf_exclude_path ^/usr/lib/systemd/tests/unit-tests/.*$" \
         --define "__script_requires %{nil}" \
         --define "_find_debuginfo_dwz_opts %{nil}" \
+        --define "_fixperms true" \
         --noclean \
         "$@" \
         "pkg/$ID/systemd.spec"