From: John P. Davis Date: Fri, 19 Mar 2004 16:06:37 +0000 (+0000) Subject: removing all refs to hgcc X-Git-Tag: CATALYST_2_0_6_916~1060 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8fe846d6aa3b7ae5850f25d934fa2dd347313c53;p=catalyst.git removing all refs to hgcc git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@313 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index a1a81a88..b30781d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.23 2004/03/05 06:24:17 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.24 2004/03/19 16:06:37 zhen Exp $ + + 19 Mar 2004; John Davis targets/grp/grp.sh, + targets/stage1/stage1.sh, targets/stage3/stage3.sh: + removing the hardened-gcc deps since the package itself is deprecated' 05 Mar 2004; John Davis catalyst: changing location of /etc/catalyst.conf to /etc/catalyst/catalyst.conf diff --git a/targets/grp/grp.sh b/targets/grp/grp.sh index 0b49299d..801b4456 100755 --- a/targets/grp/grp.sh +++ b/targets/grp/grp.sh @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.9 2004/02/23 17:53:18 drobbins Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.10 2004/03/19 16:06:37 zhen Exp $ case $1 in enter) @@ -35,10 +35,6 @@ run) /usr/bin/distcc-config --install 2>&1 > /dev/null /usr/bin/distccd 2>&1 > /dev/null fi - if [ ${clst_rel_type} = "hardened" ] - then - emerge --oneshot --nodeps hardened-gcc || exit 1 - fi export CONFIG_PROTECT="-*" USE="build" emerge portage diff --git a/targets/stage1/stage1.sh b/targets/stage1/stage1.sh index 314bd58b..ee95008c 100755 --- a/targets/stage1/stage1.sh +++ b/targets/stage1/stage1.sh @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1.sh,v 1.8 2004/01/29 21:53:22 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1.sh,v 1.9 2004/03/19 16:06:37 zhen Exp $ case $1 in enter) @@ -26,10 +26,6 @@ preclean) clean) #clean runs after preclean with bind mounts unmounted keepers="sys-kernel/linux-headers sys-devel/binutils sys-devel/gcc sys-apps/baselayout sys-libs/glibc virtual/glibc virtual/kernel" - if [ ${clst_rel_type} = "hardened" ] - then - keepers="${keepers} sys-devel/hardened-gcc" - fi # set everything to uid 999 (nouser) cd ${clst_chroot_path}/tmp/stage1root install -d var/db/pkg2 diff --git a/targets/stage3/stage3.sh b/targets/stage3/stage3.sh index f48ac06e..2a3e0a3d 100755 --- a/targets/stage3/stage3.sh +++ b/targets/stage3/stage3.sh @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3.sh,v 1.9 2004/02/11 03:31:55 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3.sh,v 1.10 2004/03/19 16:06:37 zhen Exp $ case $1 in enter) @@ -19,10 +19,6 @@ run) source /tmp/stage23 export USE="-* \${clst_HOSTUSE} \${GRP_STAGE23_USE}" rm -f /tmp/stage23 - if [ ${clst_rel_type} = "hardened" ] - then - emerge --oneshot --nodeps hardened-gcc || exit 1 - fi export CONFIG_PROTECT="-*" #portage needs to be merged manually with USE="build" set to avoid frying our