From: Chris Gianelloni Date: Tue, 20 Dec 2005 17:05:39 +0000 (+0000) Subject: Fixed gcc-config calls. This is 2.0_rc11. X-Git-Tag: CATALYST_2_0_6_916~506 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3e3d9ef4dc9c568c75d7bf54f5367504bdd804e;p=catalyst.git Fixed gcc-config calls. This is 2.0_rc11. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@988 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 641b5bc0..4886bed0 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.475 2005/12/20 16:32:05 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.476 2005/12/20 17:05:39 wolf31o2 Exp $ + + 20 Dec 2005; Chris Gianelloni catalyst, + targets/stage1/stage1-controller.sh: + Fixed gcc-config calls. This is 2.0_rc11. 20 Dec 2005; Chris Gianelloni catalyst: This is catalyst 2.0_rc10. diff --git a/catalyst b/catalyst index daca1f23..44672f0b 100755 --- 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.118 2005/12/20 16:32:05 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.119 2005/12/20 17:05:39 wolf31o2 Exp $ # Maintained in full by: # Eric Edgar @@ -11,7 +11,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0_rc10" +__version__="2.0_rc11" conf_values={} diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh index 739f56fd..b728d0af 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.6 2005/12/19 15:23:50 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-controller.sh,v 1.7 2005/12/20 17:05:39 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh @@ -28,22 +28,22 @@ case $1 in # We run gcc-config here this way so it works on all arches. if [ -x /usr/bin/gcc-config ] then - mythang=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 ) + mythang=$( cd /tmp/stage1root/etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 ) if [ -z "${mythang}" ] then mythang=1 fi - ROOT=/tmp/stage1root gcc-config ${mythang} + ROOT=/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 /etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 ) + mythang=$( cd /tmp/stage1root/etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 ) if [ -z "${mythang}" ] then mythang=1 fi - ROOT=/tmp/stage1root binutils-config ${mythang} + ROOT=/tmp/stage1root/ binutils-config ${mythang} fi exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh /tmp/stage1root || exit 1 ;;