This finally fixes the issues with gcc-config/binutils-config in stage1. This is...

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

diff --git a/ChangeLog b/ChangeLog
index 549cc96155c6229aa67833e4c9c74f8509bc7ffb..b74ff6b81f27c4a6faf6af91c3c9cdec02f7ff76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.488 2005/12/21 19:39:34 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.489 2005/12/21 21:03:50 wolf31o2 Exp $
+
+  21 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/stage1/stage1-controller.sh:
+  This finally fixes the issues with gcc-config/binutils-config in stage1.
+  This is catalyst 2.0_rc12.
 
   21 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/snapshot_target.py:
   Fix incorrect warning message.  portdir_overlay -> portage_overlay

diff --git a/catalyst b/catalyst
index 44672f0bf7ee7b8e9b148aa4a7f5636756298472..3d266e1fed8f4d570e4c5a6d27bcec04b291249b 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python -OO
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.119 2005/12/20 17:05:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.120 2005/12/21 21:03:50 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -11,7 +11,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc11"
+__version__="2.0_rc12"
 
 conf_values={}
 

diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 9682e8cd9ca5f231b0085146b56d87c2d8df54c6..3755e157c13fa3c1773729cea4f797dcd5ab973a 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.10 2005/12/21 17:40:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-controller.sh,v 1.11 2005/12/21 21:03:50 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 
@@ -45,7 +45,7 @@ case $1 in
                        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"
+                       /usr/sbin/env-update || exit 1
 
                exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh /tmp/stage1root || exit 1
        ;;