summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-05-30 22:19:00 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-05-30 22:19:00 +0200
commit1baea8628775da6b7713863a30381ddb0101e36d (patch)
treea003a37611fde13877c8a06e1f5b0226332f18ff
parentmkosi: Disable add-determinism on Fedora (diff)
downloadsystemd-1baea8628775da6b7713863a30381ddb0101e36d.tar.xz
systemd-1baea8628775da6b7713863a30381ddb0101e36d.zip
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.
-rwxr-xr-xmkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot1
-rwxr-xr-xmkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot1
2 files changed, 2 insertions, 0 deletions
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 3a09f00c25..7618f07839 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 e7f586cf8b..b2c56fda77 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"