Move cloud stage cleanup from fsscript to spec where possible.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

releases/weekly/scripts/cloud-prep.sh

@@ -68,13 +68,4 @@ sed -i '/^USE=\"\${USE}\ \ build\"$/d' /etc/portage/make.conf
 # clean up system
 passwd -d root
 passwd -l root
-rm -R -f /usr/portage/distfiles/*
+for i in $(find /var/log -type f); do truncate -s 0 $i; done
-rm -f /etc/ssh/ssh_host_*
-rm -f /root/.bash_history
-rm -f /root/.nano_history
-rm -f /root/.lesshst
-rm -f /root/.ssh/known_hosts
-rm -rf /usr/src/linux
-rm -rf /usr/src/linux*
-for i in $(find /var/log -type f); do echo > $i; done
-for i in $(find /tmp -type f); do rm -f $i; done

releases/weekly/specs/amd64/stage4-cloud.spec

@@ -57,3 +57,33 @@ boot/kernel/gentoo/sources: gentoo-sources
 boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
 boot/kernel/gentoo/extraversion: openstack
 boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
+
+# all of the cleanup...
+stage4/unmerge:
+	sys-kernel/genkernel
+	sys-kernel/gentoo-sources
+
+stage4/empty:
+	/root/.ccache
+	/tmp
+	/usr/portage/distfiles
+	/usr/src
+	/var/cache/edb/dep
+	/var/cache/genkernel
+	/var/empty
+	/var/run
+	/var/state
+	/var/tmp
+
+stage4/rm:
+	/etc/*-
+	/etc/*.old
+	/etc/ssh/ssh_host_*
+	/root/.*history
+	/root/.lesshst
+	/root/.ssh/known_hosts
+	/root/.viminfo
+	# Remove any generated stuff by genkernel
+	/usr/share/genkernel
+	# This is 3MB of crap for each copy
+	/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz