It looks like gcc-config/binutils-config needs to be run with the full path, since...

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

diff --git a/ChangeLog b/ChangeLog
index 4886bed0d6d5abbf9ffe35cbb4d311bd78e4f899..7b8111a3588e649ac02a2234984844c82f3fa7d3 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.476 2005/12/20 17:05:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.477 2005/12/20 20:30:47 wolf31o2 Exp $
+
+  20 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-controller.sh:
+  It looks like gcc-config/binutils-config needs to be run with the full path,
+  since it is run outside of the chroot.
 
   20 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/stage1/stage1-controller.sh:

diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index b728d0af10cd73ccff700346e233a5e8f7e63e24..a8c3d4a1917c4ae3edb2c013c974f96521b7f40d 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.7 2005/12/20 17:05:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-controller.sh,v 1.8 2005/12/20 20:30:47 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 /tmp/stage1root/etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
+                       mythang=$( cd ${clst_chroot_path}/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=${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 /tmp/stage1root/etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 )
+                       mythang=$( cd ${clst_chroot_path}/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=${clst_chroot_path}/tmp/stage1root/ binutils-config ${mythang}
                fi
                exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh /tmp/stage1root || exit 1
        ;;