cleanup, build-vm: mutual support

It appears that reusing installer-feature-*-stage3 packages is perfectly fine with VM images; these just need to be removed after the package scripts they carry have worked out.

cleanup, build-vm: mutual support
0a5f164d · Michael Shigorin · 8a04d9b6 · 0a5f164d · 0a5f164d · 0a5f164d
Commit 0a5f164d authored Jun 19, 2012 by Michael Shigorin
Showing with 8 additions and 2 deletions

vm.mk conf.d/vm.mk +2 -1

90cleanup-pkgs features.in/cleanup/image-scripts.d/90cleanup-pkgs +5 -0

90cleanup-pkgs features.in/cleanup/install2/image-scripts.d/90cleanup-pkgs +1 -1

No files found.
--- a/conf.d/vm.mk
+++ b/conf.d/vm.mk
 # virtual machines
 ifeq (vm,$(IMAGE_CLASS))

-vm/icewm: vm/bare use/x11/xdm +icewm; @:
+# NB: use/x11 employs some installer-feature packages
+vm/icewm: vm/bare use/cleanup/installer use/x11/xdm +icewm; @:

 endif
--- a/features.in/cleanup/image-scripts.d/90cleanup-pkgs
+++ b/features.in/cleanup/image-scripts.d/90cleanup-pkgs
+#!/bin/sh -efu
+# remove temporary packages from the installed system
+
+list="$(rpmquery -a --qf='%{NAME}\n' $GLOBAL_CLEANUP_PACKAGES)"
+[ -z "$list" ] || apt-get remove -f -y  -- $list
--- a/features.in/cleanup/install2/image-scripts.d/90cleanup-pkgs
+++ b/features.in/cleanup/install2/image-scripts.d/90cleanup-pkgs
@@ -14,7 +14,7 @@ cat > "$SCRIPT" << EOF
 # don't override the script start message on the same line
 echo "removing $GLOBAL_CLEANUP_PACKAGES"

-# remove extra packages from installed system
+# remove temporary packages from the installed system
 list="\$(exec_chroot rpmquery -a --qf='%{NAME}\\n' $GLOBAL_CLEANUP_PACKAGES)"
 [ -z "\$list" ] || exec_chroot apt-get remove -f -y  -- \$list
 EOF