]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Always specify _sourcedir as an absolute path
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 12 Aug 2024 10:08:06 +0000 (12:08 +0200)
committerJörg Behrmann <behrmann@physik.fu-berlin.de>
Mon, 12 Aug 2024 11:52:30 +0000 (13:52 +0200)
Relative _sourcedir was never supported by rpm:
https://github.com/rpm-software-management/rpm/issues/3208#issuecomment-2283520243

docs/building-rpms-from-source.md
mkosi.conf.d/30-rpm/mkosi.build.chroot

index 1eb4ec422111cf0a6074de48669d3214e6f65bd2..efbd105e9d8de61f450bb852628ea8d20eb67403 100644 (file)
@@ -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"} \
index 555030c4bf15aedb18f9463c1a25787fe120b32e..90edb1c420db2351ebc5e453bedd40b56737f9d1 100755 (executable)
@@ -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