From 2f6046f66b61e4f12a53d6d93dcd59f25971ccf6 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 3 Jul 2024 20:20:31 +0200
Subject: [PATCH] mkosi: Clean up old packages from the build directory

---
 mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot  | 5 +++++
 .../system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot  | 5 +++++
 .../system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot  | 2 ++
 .../system/mkosi.conf.d/10-opensuse/mkosi.build.chroot       | 5 +++++
 4 files changed, 17 insertions(+)

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 d5913dd1d0f..eb985ce5e5c 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
@@ -90,5 +90,10 @@ env --chdir="pkg/$ID" \
     PKGEXT=".pkg.tar" \
     MESON_EXTRA_CONFIGURE_OPTIONS="$MKOSI_MESON_OPTIONS $MESON_OPTIONS"
 
+(
+    shopt -s nullglob
+    rm -f "$BUILDDIR"/*.pkg.tar
+)
+
 cp "$OUTPUTDIR"/*.pkg.tar "$PACKAGEDIR"
 cp "$OUTPUTDIR"/*.pkg.tar "$BUILDDIR"
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 5e7e29612af..21f106292bb 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
@@ -113,5 +113,10 @@ CXX_LD="$( ((LLVM)) && echo lld)" \
     --noclean \
     "pkg/$ID/systemd.spec"
 
+(
+    shopt -s nullglob
+    rm -f "$BUILDDIR"/*.rpm
+)
+
 cp "$OUTPUTDIR"/*.rpm "$PACKAGEDIR"
 cp "$OUTPUTDIR"/*.rpm "$BUILDDIR"
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 047037ad60e..f1eed039246 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
@@ -137,6 +137,8 @@ fi
 
 (
     shopt -s nullglob
+    rm -f "$BUILDDIR"/*.deb "$BUILDDIR"/*.ddeb
+
     cp ../*.deb ../*.ddeb "$PACKAGEDIR"
     cp ../*.deb ../*.ddeb "$OUTPUTDIR"
     cp ../*.deb ../*.ddeb "$BUILDDIR"
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 3adf036af40..67481d0b10c 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
@@ -132,5 +132,10 @@ if ! build; then
     build --noprep --nocheck
 fi
 
+(
+    shopt -s nullglob
+    rm -f "$BUILDDIR"/*.rpm
+)
+
 cp "$OUTPUTDIR"/*.rpm "$PACKAGEDIR"
 cp "$OUTPUTDIR"/*.rpm "$BUILDDIR"
-- 
2.47.3