From: "Richard Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/stage4/, targets/support/
Date: Thu, 3 Sep 2015 01:51:09 +0000 (UTC) [thread overview]
Message-ID: <1441244766.e8ee4a518a2dc48d845e2f6bd09e0ce2cc62996e.zerochaos@gentoo> (raw)
commit: e8ee4a518a2dc48d845e2f6bd09e0ce2cc62996e
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 01:46:06 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 01:46:06 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e8ee4a51
use the cleanup_stage function instead of manual cleanup for stage4, do not wipe log directories for tinderbox
targets/stage4/stage4-preclean-chroot.sh | 10 +---------
targets/support/chroot-functions.sh | 2 +-
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
index 8f2e894..a22b6c1 100755
--- a/targets/stage4/stage4-preclean-chroot.sh
+++ b/targets/stage4/stage4-preclean-chroot.sh
@@ -7,12 +7,4 @@ source /tmp/chroot-functions.sh
update_env_settings
show_debug
-if [ -n "${clst_DISTCC}" ]
-then
- cleanup_distcc
-fi
-
-if [ -n "${clst_ICECREAM}" ]
-then
- cleanup_icecream
-fi
+cleanup_stages
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(){
next reply other threads:[~2015-09-03 1:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-03 1:51 Richard Farina [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-05 0:38 [gentoo-commits] proj/catalyst:master commit in: targets/stage4/, targets/support/ Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441244766.e8ee4a518a2dc48d845e2f6bd09e0ce2cc62996e.zerochaos@gentoo \
--to=zerochaos@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox