From: Chris Gianelloni Date: Mon, 12 Feb 2007 22:08:29 +0000 (+0000) Subject: Added patch from Andrew Gaffney for bug #166420 to remove the... X-Git-Tag: CATALYST_2_0_6_916~280 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=63abde1ac7c8442bda4b8f005d1b68f58d4a09af;p=catalyst.git Added patch from Andrew Gaffney for bug #166420 to remove the autoresume point for portage, as it really isn't needed and doesn't really gain us much, anyway. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1214 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index d6d5d91b..ad75b6ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 12 Feb 2007; Chris Gianelloni + targets/support/chroot-functions.sh: + Added patch from Andrew Gaffney for bug #166420 to + remove the autoresume point for portage, as it really isn't needed and + doesn't really gain us much, anyway. + 12 Feb 2007; Chris Gianelloni targets/stage1/stage1-chroot.sh: Added patch from Andrew Gaffney for bug #166426. diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index edf6c6d9..bd5c9d5f 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -85,13 +85,13 @@ setup_myemergeopts(){ setup_portage(){ # portage needs to be merged manually with USE="build" set to avoid frying # our make.conf. emerge system could merge it otherwise. - if [ "${clst_AUTORESUME}" = "1" -a -e /tmp/.clst_portage ] - then - echo "Portage Autoresume point found not emerging portage" - else +# if [ "${clst_AUTORESUME}" = "1" -a -e /tmp/.clst_portage ] +# then +# echo "Portage Autoresume point found not emerging portage" +# else USE="build" run_emerge --oneshot --nodeps portage - touch /tmp/.clst_portage || exit 1 - fi +# touch /tmp/.clst_portage || exit 1 +# fi } setup_gcc(){