Remove using gcc-config to set things up as we should all be using 2005.0 seed stages...

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

diff --git a/ChangeLog b/ChangeLog
index 6981c9207fcb4b43d5d295691ad8420bac37dff9..5f071407f44a850311ab5aade342543439600c64 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.253 2005/04/29 18:10:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.254 2005/04/29 21:31:32 rocket Exp $
+
+  29 Apr 2005; Eric Edgar <rocket@gentoo.org>
+  targets/stage1/stage1-chroot.sh, targets/stage1/stage1-preclean-chroot.sh:
+  Remove using gcc-config to set things up as we should all be using 2005.0
+  seed stages now.
 
   29 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   examples/livecd-stage2_template.spec:

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 5ee4a0eaa71de25beab3b75ca44df6f9f79239a1..4fa79e03e6027194c37ea556e63905ddbf390b98 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -1,7 +1,7 @@
 #!/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-chroot.sh,v 1.31 2005/04/14 14:59:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.32 2005/04/29 21:31:32 rocket Exp $
        
 
 . /tmp/chroot-functions.sh
@@ -9,7 +9,7 @@
 check_portage_version
 
 update_env_settings
-setup_gcc
+#setup_gcc
 
 setup_myfeatures
 setup_myemergeopts

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