From 77902523be029b55db4f0836eca734729f040313 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 29 Feb 2008 20:34:06 +0000 Subject: [PATCH] Remove code for gcc-config/binutils-config since it should be getting done in the preclean script, anyway. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1347 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ targets/stage1/stage1-controller.sh | 24 ------------------------ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c122fbe..42ce8b2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 29 Feb 2008; Chris Gianelloni + targets/stage1/stage1-controller.sh: + Remove code for gcc-config/binutils-config since it should be getting done + in the preclean script, anyway. + 29 Feb 2008; Chris Gianelloni targets/stage1/stage1-chroot.sh: I missed one place where HOSTUSE was being used incorrectly. diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh index 4e100e62..0ecad29f 100755 --- a/targets/stage1/stage1-controller.sh +++ b/targets/stage1/stage1-controller.sh @@ -22,30 +22,6 @@ case $1 in || exit 1 ;; preclean) - # Before we enter the chroot, we need to run gcc-config/binutils-config - if [ -x /usr/bin/gcc-config ] && [ -z "${clst_FETCH}" ] - then - 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=${clst_chroot_path}/tmp/stage1root/ \ - CHOST=${clst_CHOST} \ - gcc-config ${mythang} - fi - if [ -x /usr/bin/binutils-config ] && [ -z "${clst_FETCH}" ] - then - 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=${clst_chroot_path}/tmp/stage1root/ \ - CHOST=${clst_CHOST} \ - binutils-config ${mythang} - fi - exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh /tmp/stage1root || exit 1 ;; clean) -- 2.26.2