proxy CLEANUP_PACKAGES down

mkimage implementation requires that the variables
to be passed to the scripts are to be prefixed with
GLOBAL_ or INFO_ tags as appropriate; in this case
the upstream makefile didn't care to.

features.in/build-vm/lib/90-build-vm.mk

@@ -42,6 +42,7 @@ convert-image: prepare-image
 		rm "$(VM_RAWDISK)"; \
 	fi
 
+run-image-scripts: GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES)
 run-image-scripts: GLOBAL_ROOTPW := $(ROOTPW)
 
 # override

features.in/cleanup/image-scripts.d/90cleanup-pkgs

@@ -1,6 +1,7 @@
 #!/bin/sh -efu
 # remove temporary packages from the installed system
 
-### FIXME: need to proxy CLEANUP_PACKAGES -> GLOBAL_CLEANUP_PACKAGES somewhere
+[ -n "$GLOBAL_CLEANUP_PACKAGES" ] || exit 0
+
 list="$(rpmquery -a --qf='%{NAME}\n' $GLOBAL_CLEANUP_PACKAGES)"
 [ -z "$list" ] || apt-get remove -f -y  -- $list