Added patch from vapier and closing bug #73556.

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

diff --git a/ChangeLog b/ChangeLog
index 7056fcf483f30da76781d7170ec4c11749c4c661..6fb8cb515fa94221fed5009a8c945c958a6378f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.114 2004/11/23 00:02:56 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.115 2004/12/06 22:25:10 wolf31o2 Exp $
+
+  06 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-preclean2-chroot.sh:
+  Added patch from vapier and closing bug #73556.
 
   22 Nov 2004; John Davis <zhen@gentoo.org> modules/embedded_target.py,
   modules/generic_stage_target.py, -targets/embedded/cramfs-runscript.sh,

diff --git a/targets/stage1/stage1-preclean2-chroot.sh b/targets/stage1/stage1-preclean2-chroot.sh
index ea1676311ac35e2a9d43d6fb44f3bc4ce48ebf06..ae6018fccad5c91675bb40c4a834247194935a36 100755 (executable)
--- a/targets/stage1/stage1-preclean2-chroot.sh
+++ b/targets/stage1/stage1-preclean2-chroot.sh
@@ -1,15 +1,14 @@
 #!/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/Attic/stage1-preclean2-chroot.sh,v 1.4 2004/10/15 02:46:58 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1-preclean2-chroot.sh,v 1.5 2004/12/06 22:25:10 wolf31o2 Exp $
                
 #now, some finishing touches to initialize gcc-config....
 unset ROOT
 
 if [ -e /usr/bin/gcc-config ]
 then
-       mythang=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* )
-       echo $mythang; sleep 20
+       mythang=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
        gcc-config ${mythang}; /usr/sbin/env-update; source /etc/profile
 fi