From 379ad5f271c98470d2c199a2ed9cecd1b2ea8461 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 25 Apr 2008 02:21:26 +0000 Subject: [PATCH] We probably shouldn't be running our debug functions in our stages. Let's fix this. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1402 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 ++++++++ targets/stage1/stage1-preclean-chroot.sh | 6 ++++++ targets/stage2/stage2-preclean-chroot.sh | 6 ++++++ targets/stage3/stage3-preclean-chroot.sh | 6 ++++++ targets/stage4/stage4-preclean-chroot.sh | 6 ++++++ 5 files changed, 32 insertions(+) diff --git a/ChangeLog b/ChangeLog index 46805449..b9602784 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 25 Apr 2008; Chris Gianelloni + targets/stage1/stage1-preclean-chroot.sh, + targets/stage2/stage2-preclean-chroot.sh, + targets/stage3/stage3-preclean-chroot.sh, + targets/stage4/stage4-preclean-chroot.sh: + We probably shouldn't be running our debug functions in our stages. Let's + fix this. + 24 Apr 2008; Chris Gianelloni targets/support/chroot-functions.sh: Added a get_libdir call and fail if we don't have a valid LIBDIR when using diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh index 6e8eab33..8e12593f 100755 --- a/targets/stage1/stage1-preclean-chroot.sh +++ b/targets/stage1/stage1-preclean-chroot.sh @@ -1,7 +1,13 @@ #!/bin/bash +export RUN_DEFAULT_FUNCS="no" + source /tmp/chroot-functions.sh +# Since we didn't run the default functions, we call a couple here. +update_env_settings +setup_myfeatures + # Now, some finishing touches to initialize gcc-config.... unset ROOT diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh index ddc9b31f..a24cbc5d 100755 --- a/targets/stage2/stage2-preclean-chroot.sh +++ b/targets/stage2/stage2-preclean-chroot.sh @@ -1,7 +1,13 @@ #!/bin/bash +export RUN_DEFAULT_FUNCS="no" + source /tmp/chroot-functions.sh +# Since we didn't run the default functions, we call a couple here. +update_env_settings +setup_myfeatures + cleanup_stages if [ -n "${clst_CCACHE}" ] diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh index ddc9b31f..a24cbc5d 100755 --- a/targets/stage3/stage3-preclean-chroot.sh +++ b/targets/stage3/stage3-preclean-chroot.sh @@ -1,7 +1,13 @@ #!/bin/bash +export RUN_DEFAULT_FUNCS="no" + source /tmp/chroot-functions.sh +# Since we didn't run the default functions, we call a couple here. +update_env_settings +setup_myfeatures + cleanup_stages if [ -n "${clst_CCACHE}" ] diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh index 240e2cbb..7b50e046 100755 --- a/targets/stage4/stage4-preclean-chroot.sh +++ b/targets/stage4/stage4-preclean-chroot.sh @@ -1,7 +1,13 @@ #!/bin/bash +export RUN_DEFAULT_FUNCS="no" + source /tmp/chroot-functions.sh +# Since we didn't run the default functions, we call a couple here. +update_env_settings +setup_myfeatures + if [ -n "${clst_DISTCC}" ] then cleanup_distcc -- 2.26.2