From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 16 Jan 2024 15:57:47 +0000 (+0100)
Subject: Use $PACKAGEDIR when building mkosi rpm
X-Git-Tag: v20.2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=756172ec9b217be3b14b6808a45e60cc618167a5;p=thirdparty%2Fmkosi.git

Use $PACKAGEDIR when building mkosi rpm
---

diff --git a/mkosi.conf.d/30-rpm/mkosi.build.chroot b/mkosi.conf.d/30-rpm/mkosi.build.chroot
index 7cfdf5b3a..e738eb4d9 100755
--- a/mkosi.conf.d/30-rpm/mkosi.build.chroot
+++ b/mkosi.conf.d/30-rpm/mkosi.build.chroot
@@ -8,6 +8,6 @@ rpmbuild \
     $([ "$WITH_TESTS" = "0" ] && echo --nocheck) \
     --define "_topdir $PWD" \
     --define "_sourcedir rpm" \
-    --define "_rpmdir $OUTPUTDIR" \
+    --define "_rpmdir $PACKAGEDIR" \
     --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
     rpm/mkosi.spec
diff --git a/mkosi.conf.d/30-rpm/mkosi.postinst b/mkosi.conf.d/30-rpm/mkosi.postinst
index 91d0d6fc0..89b6ff465 100755
--- a/mkosi.conf.d/30-rpm/mkosi.postinst
+++ b/mkosi.conf.d/30-rpm/mkosi.postinst
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 
-rpm --install "$OUTPUTDIR"/*mkosi*.rpm
+dnf install --best mkosi