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

diff --git a/ChangeLog b/ChangeLog
index 46805449b7c0a2b4344bec46425d5121a737b26c..b96027840d1f2a011cf2c08f97c22b8b7eb0576c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  25 Apr 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 probably shouldn't be running our debug functions in our stages. Let's
+  fix this.
+
   24 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   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 6e8eab33c07e6d5cf90d952c3ffed88f7c26ef21..8e12593f32ad6d9d37d2b0087737fc760e9a9a27 100755 (executable)
--- 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 ddc9b31f50b7d14c2b9c1174a3d0677ad24f51ad..a24cbc5d4a5259d4b3117da212dfb81edef1cc92 100755 (executable)
--- 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 ddc9b31f50b7d14c2b9c1174a3d0677ad24f51ad..a24cbc5d4a5259d4b3117da212dfb81edef1cc92 100755 (executable)
--- 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 240e2cbb64c3f107af16124acc40858c6149739c..7b50e046b14ae55f7b404c5fd48cb906fc270737 100755 (executable)
--- 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