We don't want to run setup_myfeatures in preclean, but still want to update the envir...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1406 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index da751fcb9423f314644491b45ef9a1eba52e69a6..bca5e4091ddfe10d41a4f616add28bad3db30cbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  09 May 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  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 don't want to run setup_myfeatures in preclean, but still want to update
+  the environment and show our debug information.
+
   25 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-preclean-chroot.sh,
   targets/stage2/stage2-preclean-chroot.sh,

diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
index 6e8eab33c07e6d5cf90d952c3ffed88f7c26ef21..a80fc92e8965fab85079c4d8b96a0c913d1168f1 100755 (executable)
--- a/targets/stage1/stage1-preclean-chroot.sh
+++ b/targets/stage1/stage1-preclean-chroot.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
+export RUN_DEFAULT_FUNCS="no"
+
 source /tmp/chroot-functions.sh
 
+update_env_settings
+show_debug
+
 # 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 ddc9b31f50b7d14c2b9c1174a3d0677ad24f51ad..3b693d8160c2444e2673f5facd39dc7e921e1612 100755 (executable)
--- a/targets/stage2/stage2-preclean-chroot.sh
+++ b/targets/stage2/stage2-preclean-chroot.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
+export RUN_DEFAULT_FUNCS="no"
+
 source /tmp/chroot-functions.sh
 
+update_env_settings
+show_debug
+
 cleanup_stages
 
 if [ -n "${clst_CCACHE}" ]

diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
index ddc9b31f50b7d14c2b9c1174a3d0677ad24f51ad..3b693d8160c2444e2673f5facd39dc7e921e1612 100755 (executable)
--- a/targets/stage3/stage3-preclean-chroot.sh
+++ b/targets/stage3/stage3-preclean-chroot.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
+export RUN_DEFAULT_FUNCS="no"
+
 source /tmp/chroot-functions.sh
 
+update_env_settings
+show_debug
+
 cleanup_stages
 
 if [ -n "${clst_CCACHE}" ]

diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
index 240e2cbb64c3f107af16124acc40858c6149739c..8f2e8941d4c3f2ee83055933dec9a18928d6571e 100755 (executable)
--- a/targets/stage4/stage4-preclean-chroot.sh
+++ b/targets/stage4/stage4-preclean-chroot.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
+export RUN_DEFAULT_FUNCS="no"
+
 source /tmp/chroot-functions.sh
 
+update_env_settings
+show_debug
+
 if [ -n "${clst_DISTCC}" ]
 then
        cleanup_distcc