From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 12 Aug 2024 10:08:06 +0000 (+0200)
Subject: Always specify _sourcedir as an absolute path
X-Git-Tag: v25~361
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11b05012c83f22b2a106599af490ad179b020c1d;p=thirdparty%2Fmkosi.git

Always specify _sourcedir as an absolute path

Relative _sourcedir was never supported by rpm:
https://github.com/rpm-software-management/rpm/issues/3208#issuecomment-2283520243
---

diff --git a/docs/building-rpms-from-source.md b/docs/building-rpms-from-source.md
index 1eb4ec422..efbd105e9 100644
--- a/docs/building-rpms-from-source.md
+++ b/docs/building-rpms-from-source.md
@@ -71,7 +71,7 @@ mkosi-chroot \
     --query \
     --buildrequires \
     --define "_topdir /var/tmp" \
-    --define "_sourcedir rpm" \
+    --define "_sourcedir $PWD/mkosi/rpm" \
     rpm/mkosi.spec |
         sort --unique |
         tee /tmp/buildrequires |
@@ -83,7 +83,7 @@ until mkosi-chroot \
     -bd \
     --build-in-place \
     --define "_topdir /var/tmp" \
-    --define "_sourcedir rpm" \
+    --define "_sourcedir $PWD/mkosi/rpm" \
     --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
     rpm/mkosi.spec
 do
@@ -157,7 +157,7 @@ env --chdir=mkosi \
     --build-in-place \
     $([ "$WITH_TESTS" = "0" ] && echo --nocheck) \
     --define "_topdir /var/tmp" \
-    --define "_sourcedir rpm" \
+    --define "_sourcedir $PWD/mkosi/rpm" \
     --define "_rpmdir $OUTPUTDIR" \
     ${BUILDDIR:+--define} \
     ${BUILDDIR:+"_vpath_builddir $BUILDDIR"} \
diff --git a/mkosi.conf.d/30-rpm/mkosi.build.chroot b/mkosi.conf.d/30-rpm/mkosi.build.chroot
index 555030c4b..90edb1c42 100755
--- a/mkosi.conf.d/30-rpm/mkosi.build.chroot
+++ b/mkosi.conf.d/30-rpm/mkosi.build.chroot
@@ -7,7 +7,7 @@ rpmbuild \
     --build-in-place \
     $([ "$WITH_TESTS" = "0" ] && echo --nocheck) \
     --define "_topdir /var/tmp" \
-    --define "_sourcedir rpm" \
+    --define "_sourcedir $PWD/rpm" \
     --define "_rpmdir $PACKAGEDIR" \
     --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
     rpm/mkosi.spec