move cleanup to finalize

qt cleanup was already done here
This commit is contained in:
Harald Sitter
2024-11-05 02:00:22 +01:00
parent c1a8c0592c
commit 6b144bad73
2 changed files with 4 additions and 5 deletions

View File

@@ -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" .

View File

@@ -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