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 7cfdf5b3a9ec2166acc528f67c2b5df19ce8f8bf..e738eb4d99b6da640dfb54210cdbf9e77789631f 100755 (executable)
--- 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 91d0d6fc0e575d45fafc45815fc62bd080589e97..89b6ff46564c489465d6baa5d4793ffe5491cf36 100755 (executable)
--- 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