From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Wed, 21 Dec 2005 15:04:09 +0000 (+0000)
Subject: Moved gcc-config/binutils-config to before the chroot.
X-Git-Tag: CATALYST_2_0_6_916~499
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c20eb8ed9267cc3a64cb3dd1df71534513f1a6cf;p=catalyst.git

Moved gcc-config/binutils-config to before the chroot.


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

diff --git a/ChangeLog b/ChangeLog
index ac1a86be..d489890d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.482 2005/12/21 06:32:09 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.483 2005/12/21 15:04:09 wolf31o2 Exp $
+
+  21 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-controller.sh:
+  Moved gcc-config/binutils-config to before the chroot.
 
   21 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py:
   Remove requirement on md5sum,sha1sum,crc32 .. only need to have shash
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index a8c3d4a1..9222f10e 100755
--- 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.8 2005/12/20 20:30:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-controller.sh,v 1.9 2005/12/21 15:04:09 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 
@@ -18,14 +18,8 @@ case $1 in
 		copy_to_chroot ${clst_chroot_path}/etc/make.conf /${clst_root_path}/etc
 		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)
-		# We run gcc-config here this way so it works on all arches.
+
+		# Before we enter the chroot, we need to run gcc-config/binutils-config
 		if [ -x /usr/bin/gcc-config ]
 		then
 			mythang=$( cd ${clst_chroot_path}/tmp/stage1root/etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
@@ -35,7 +29,6 @@ case $1 in
 			fi
 			ROOT=${clst_chroot_path}/tmp/stage1root/ gcc-config ${mythang}
 		fi
-		# We run binutils-config here so it works on all arches.
 		if [ -x /usr/bin/binutils-config ]
 		then
 			mythang=$( cd ${clst_chroot_path}/tmp/stage1root/etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 )
@@ -45,6 +38,13 @@ case $1 in
 			fi
 			ROOT=${clst_chroot_path}/tmp/stage1root/ binutils-config ${mythang}
 		fi
+
+		# 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)