From 5524d2838c7d73e33ff2938e7563b008ba829bd4 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 27 Mar 2024 14:05:44 +0100
Subject: [PATCH] mkosi: Copy built packages to output directory

This allows the built packages to be inspected if needed, or installed
on the host system for anyone who's daring enough to do so.
---
 mkosi.images/system/mkosi.clean                               | 4 ++++
 mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot   | 4 +++-
 .../system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot   | 4 +++-
 .../system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot   | 3 ++-
 .../system/mkosi.conf.d/10-opensuse/mkosi.build.chroot        | 4 +++-
 5 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100755 mkosi.images/system/mkosi.clean

diff --git a/mkosi.images/system/mkosi.clean b/mkosi.images/system/mkosi.clean
new file mode 100755
index 00000000000..cb716c41f71
--- /dev/null
+++ b/mkosi.images/system/mkosi.clean
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+rm -f "$OUTPUTDIR"/*.{rpm,deb,pkg.tar}
diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot
index 1c5f5827018..9cdee05b185 100755
--- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot
@@ -50,6 +50,8 @@ env --chdir="pkg/$PKG_SUBDIR" \
     _systemd_UPSTREAM=1 \
     _systemd_QUIET=1 \
     BUILDDIR="$PWD/pkg/$PKG_SUBDIR" \
-    PKGDEST="$PACKAGEDIR" \
+    PKGDEST="$OUTPUTDIR" \
     PKGEXT=".pkg.tar" \
     MESON_EXTRA_CONFIGURE_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"
+
+cp "$OUTPUTDIR"/*.pkg.tar "$PACKAGEDIR"
diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
index b8b130e0e85..66bcff92d75 100755
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
@@ -24,7 +24,7 @@ rpmbuild \
     $( ((WITH_DOCS))  || echo "--without docs") \
     --define "_topdir /var/tmp" \
     --define "_sourcedir pkg/$PKG_SUBDIR" \
-    --define "_rpmdir $PACKAGEDIR" \
+    --define "_rpmdir $OUTPUTDIR" \
     ${BUILDDIR:+--define} \
     ${BUILDDIR:+"_vpath_builddir $BUILDDIR"} \
     --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
@@ -46,3 +46,5 @@ rpmbuild \
     --define "__script_requires %{nil}" \
     --undefine _lto_cflags \
     "pkg/$PKG_SUBDIR/systemd.spec"
+
+cp "$OUTPUTDIR"/*.rpm "$PACKAGEDIR"
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
index 7fb650f5013..106b8ed4e6c 100755
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
@@ -86,4 +86,5 @@ if ! build; then
     build
 fi
 
-mv ../*.deb "$PACKAGEDIR"
+cp ../*.deb "$PACKAGEDIR"
+cp ../*.deb "$OUTPUTDIR"
diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
index b809a10bb01..3d45b431179 100755
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot
@@ -29,7 +29,7 @@ build() {
         $( ((WITH_TESTS)) || echo --nocheck) \
         --define "_topdir /var/tmp" \
         --define "_sourcedir pkg/$PKG_SUBDIR" \
-        --define "_rpmdir $PACKAGEDIR" \
+        --define "_rpmdir $OUTPUTDIR" \
         ${BUILDDIR:+--define} \
         ${BUILDDIR:+"_vpath_builddir $BUILDDIR"} \
         --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
@@ -61,3 +61,5 @@ if ! build; then
     cat /tmp/unpackaged-files >>"pkg/$PKG_SUBDIR/files.systemd"
     build --noprep --nocheck
 fi
+
+cp "$OUTPUTDIR"/*.rpm "$PACKAGEDIR"