From 6b144bad73cf6660dececc293005e45b13803cfb Mon Sep 17 00:00:00 2001
From: Harald Sitter <sitter@kde.org>
Date: Tue, 5 Nov 2024 02:00:22 +0100
Subject: [PATCH] move cleanup to finalize

qt cleanup was already done here
---
 build.sh              | 4 ----
 mkosi.finalize.chroot | 5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 02e9a5f..ca773ff 100755
--- a/build.sh
+++ b/build.sh
@@ -88,10 +88,6 @@ if $OUTPUT_IS_BTRFS_SUBVOLUME; then
     LIVE_SIZE=$(stat --format %s "$OUTPUT.btrfs.live") # the actual size of all data
 fi
 
-# Cleanup
-rm -f "${OUTPUT}/var/cache/pacman/pkg/*"
-rm -rf "${OUTPUT}/usr/share/doc/qt6/examples"
-
 # Create rootfs tarball for consumption by systemd-sysext (doesn't currently support consuming raw images :()
 rm -rf "$TAR" ./*.tar
 tar -C "${OUTPUT}"/ -cf "$TAR" .
diff --git a/mkosi.finalize.chroot b/mkosi.finalize.chroot
index ab1b86a..d0730a2 100755
--- a/mkosi.finalize.chroot
+++ b/mkosi.finalize.chroot
@@ -18,7 +18,10 @@ if [ -f "$SRCDIR/.secure_files/gpg.public.key" ]; then # only useful and availab
     gpg --no-options --no-default-keyring --keyring="$KEYRING" --homedir="$GNUPGHOME" --import "$SRCDIR/.secure_files/gpg.public.key"
 fi
 
-rm -rfv /etc/pacman.d/gnupg
+# De-initialize pacman
+rm -rf \
+    /etc/pacman.d/gnupg \
+    /var/cache/pacman
 
 # Remove all excess things we don't want in the final image