Revert gcc-config/binutils-config to _rc11 locations. This should fix running gcc...

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

diff --git a/ChangeLog b/ChangeLog
index c05ead2f65983c9fca3279b17cf8c08ea778434f..6c0aa08bbb658fd7efc609bfe581604afeb38bd7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.486 2005/12/21 17:18:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.487 2005/12/21 17:40:00 wolf31o2 Exp $
+
+  21 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-controller.sh,
+  targets/stage1/stage1-preclean-chroot.sh:
+  Revert gcc-config/binutils-config to _rc11 locations. This should fix
+  running gcc-config and binutils-config, though it probably breaks running on
+  non-Gentoo platforms.
 
   21 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/stage1_target.py:

diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 9222f10ef33a4ab61d4f81b981e45576d63e2ac4..9682e8cd9ca5f231b0085146b56d87c2d8df54c6 100755 (executable)
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-controller.sh,v 1.9 2005/12/21 15:04:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-controller.sh,v 1.10 2005/12/21 17:40:00 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 
@@ -19,6 +19,12 @@ case $1 in
                copy_to_chroot ${clst_chroot_path}/etc/make.profile \
                        /${clst_root_path}/etc
 
+               # Enter chroot, execute our build script
+               exec_in_chroot \
+                       ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \
+                       || exit 1
+       ;;
+       preclean)
                # Before we enter the chroot, we need to run gcc-config/binutils-config
                if [ -x /usr/bin/gcc-config ]
                then
@@ -38,13 +44,9 @@ case $1 in
                        fi
                        ROOT=${clst_chroot_path}/tmp/stage1root/ binutils-config ${mythang}
                fi
+               ${clst_CHROOT} ${clst_chroot_path}/tmp/stage1root \
+                       "/bin/bash << EOF;env-update && source /etc/profile;EOF"
 
-               # Enter chroot, execute our build script
-               exec_in_chroot \
-                       ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \
-                       || exit 1
-       ;;
-       preclean)
                exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh /tmp/stage1root || exit 1
        ;;
        clean)

diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
index ca16d1be2ae1cb2b56bef5678543ae3554f095c0..c87d8a29a299b5356264c3af417d446f3ce59edc 100755 (executable)
--- a/targets/stage1/stage1-preclean-chroot.sh
+++ b/targets/stage1/stage1-preclean-chroot.sh
@@ -1,11 +1,15 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-preclean-chroot.sh,v 1.8 2005/12/19 15:23:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-preclean-chroot.sh,v 1.9 2005/12/21 17:40:00 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
-update_env_settings
+# Now, some finishing touches to initialize gcc-config....
+unset ROOT
+
+setup_gcc
+setup_binutils
 
 # Stage1 is not going to have anything in zoneinfo, so save our Factory timezone
 if [ -d /usr/share/zoneinfo ]