From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 16 Apr 2024 11:59:20 +0000 (+0200)
Subject: mkosi: Add --noclean when running rpmbuild
X-Git-Tag: v256-rc1~168^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1884281a01cfd6da0d61d7befb88dedfca5c669;p=thirdparty%2Fsystemd.git

mkosi: Add --noclean when running rpmbuild

The entire build environment is ephemeral anyway so everything is
cleaned regardless. By specifying --noclean, we make debugging
easier as the rpm build root can be inspected when using --debug-shell.
---

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 242fc4aa407..371af8f4b9f 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
@@ -48,6 +48,7 @@ rpmbuild \
     --define "__elf_exclude_path ^/usr/lib/systemd/tests/unit-tests/.*$" \
     --define "__script_requires %{nil}" \
     --undefine _lto_cflags \
+    --noclean \
     "pkg/$ID/systemd.spec"
 
 cp "$OUTPUTDIR"/*.rpm "$PACKAGEDIR"
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 62b329998d8..5bc78aee3bf 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
@@ -49,6 +49,7 @@ build() {
         --define "__os_install_post /usr/lib/rpm/brp-suse %{nil}" \
         --define "__elf_exclude_path ^/usr/lib/systemd/tests/unit-tests/.*$" \
         --define "__script_requires %{nil}" \
+        --noclean \
         "$@" \
         "pkg/$ID/systemd.spec"
 }