From e5fd83d0dc4166d62d9df1701dc049730f60736f Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 6 Dec 2004 22:25:10 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 +++++- targets/stage1/stage1-preclean2-chroot.sh | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7056fcf4..6fb8cb51 100644 --- 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 + targets/stage1/stage1-preclean2-chroot.sh: + Added patch from vapier and closing bug #73556. 22 Nov 2004; John Davis 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 ea167631..ae6018fc 100755 --- 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 -- 2.26.2