Specify --noprep when building rpms from source

rpm upstream is moving in this direction as well so let's update our
docs to match.

diff --git a/docs/building-rpms-from-source.md b/docs/building-rpms-from-source.md
index efbd105e9d8de61f450bb852628ea8d20eb67403..14fd814519e93a37d8fb719205b391dcd85364b3 100644 (file)
--- a/docs/building-rpms-from-source.md
+++ b/docs/building-rpms-from-source.md
@@ -81,6 +81,7 @@ until mkosi-chroot \
     env --chdir=mkosi \
     rpmbuild \
     -bd \
+    --noprep \
     --build-in-place \
     --define "_topdir /var/tmp" \
     --define "_sourcedir $PWD/mkosi/rpm" \
@@ -154,6 +155,7 @@ set -e
 env --chdir=mkosi \
     rpmbuild \
     -bb \
+    --noprep \
     --build-in-place \
     $([ "$WITH_TESTS" = "0" ] && echo --nocheck) \
     --define "_topdir /var/tmp" \

diff --git a/mkosi.conf.d/30-rpm/mkosi.build.chroot b/mkosi.conf.d/30-rpm/mkosi.build.chroot
index 90edb1c420db2351ebc5e453bedd40b56737f9d1..a15df21ad13b28c52838dc493a498415ad7577d6 100755 (executable)
--- a/mkosi.conf.d/30-rpm/mkosi.build.chroot
+++ b/mkosi.conf.d/30-rpm/mkosi.build.chroot
@@ -4,6 +4,7 @@ set -ex
 
 rpmbuild \
     -bb \
+    --noprep \
     --build-in-place \
     $([ "$WITH_TESTS" = "0" ] && echo --nocheck) \
     --define "_topdir /var/tmp" \