mkosi: Clean up old packages from the build directory

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 d5913dd1d0fc78517ee30a3d79e705312efd2ee3..eb985ce5e5cf9dbab1770e2f330a7cda5294e682 100755 (executable)
--- 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 5e7e29612af362dd99f8358edb0af7fecd0d277e..21f106292bbb3038f8840a7757dde6be2c696b79 100755 (executable)
--- 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 047037ad60e44752ac1efe2ae1cdf5ebab96c37e..f1eed039246b093c1729da3d9d448a038cdd80d0 100755 (executable)
--- 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 3adf036af4014553f64b8cfc5f01dac1c2cba9a7..67481d0b10c55894e32379608767771bd03f3cbc 100755 (executable)
--- 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"