commit: 4aad35c671e5d70207e3c7ac879abf70770114b6
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 01:55:33 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 01:55:33 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4aad35c6
make tinderbox use cleanup stage, modify cleanup stage to not wipe logs for
tinderbox target
targets/support/chroot-functions.sh | 2 +-
targets/tinderbox/tinderbox-preclean-chroot.sh | 10 +---------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index b8ab8d2..2986ae7 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -234,7 +234,7 @@ cleanup_stages() {
# Remove bindist from use
sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
- rm -f /var/log/emerge.log /var/log/portage/elog/*
+ [ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log
/var/log/portage/elog/*
}
update_env_settings(){
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh
b/targets/tinderbox/tinderbox-preclean-chroot.sh
index 240e2cb..5353f67 100755
--- a/targets/tinderbox/tinderbox-preclean-chroot.sh
+++ b/targets/tinderbox/tinderbox-preclean-chroot.sh
@@ -2,12 +2,4 @@
source /tmp/chroot-functions.sh
-if [ -n "${clst_DISTCC}" ]
-then
- cleanup_distcc
-fi
-
-if [ -n "${clst_ICECREAM}" ]
-then
- cleanup_icecream
-fi
+cleanup_stages
