Added setup_binutils function and force both of them to run during stage1 cleanup.

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

diff --git a/ChangeLog b/ChangeLog
index 9717bd3c4fb8f6e083c47ee6dc25191df2ce0890..056cf7d487b717b7ee05b4f3cccdbb4eccc105d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.266 2005/06/01 16:20:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.267 2005/06/02 20:30:59 wolf31o2 Exp $
+
+  02 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-preclean-chroot.sh,
+  targets/support/chroot-functions.sh:
+  Added setup_binutils function and force both of them to run during stage1
+  cleanup.
 
   01 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   examples/livecd-stage2_template.spec:

diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
index 4a3347f41b0d929079470b5d36417e8e15952454..e89ec6e2b229aaa8d32c0da1221965cbb9e233bb 100755 (executable)
--- a/targets/stage1/stage1-preclean-chroot.sh
+++ b/targets/stage1/stage1-preclean-chroot.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
 # Copyright 1999-2004 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.5 2005/04/29 21:31:32 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-preclean-chroot.sh,v 1.6 2005/06/02 20:30:59 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
 # now, some finishing touches to initialize gcc-config....
 unset ROOT
 
-#setup_gcc
+setup_gcc
+setup_binutils
                
 # stage1 is not going to have anything in zoneinfo, so save our Factory timezone
 if [ -d /usr/share/zoneinfo ] ; then

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 6c7064a6d0e18b289e556c1ada7622aef25b060a..81b4158e7d640dcd50e17fdf00ed5caabf1a0c21 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -105,11 +105,27 @@ setup_portage(){
 setup_gcc(){
        if [ -x /usr/bin/gcc-config ]
        then
-               mythang=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
+               mythang=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
+               if [ -z "${mythang}" ]
+               then
+                       mythang=1
+               fi
                gcc-config ${mythang}; update_env_settings
        fi
 }
 
+setup_binutils(){
+       if [ -x /usr/bin/binutils-config ]
+       then
+               mythang=$( cd /etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 )
+               if [ -z "${mythang}" ]
+               then
+                       mythang=1
+               fi
+               binutils-config ${mythang}; update_env_settings
+       fi
+}
+
 update_env_settings(){
     /usr/sbin/env-update
     source /etc/profile