Added patch from Andrew Gaffney <agaffney@gentoo.org> for bug #166420 to remove the...

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 d6d5d91bc299e7a3d68e107936549d39b6c21600..ad75b6ba73ff090b860a477cafededd5a1608da7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  12 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/chroot-functions.sh:
+  Added patch from Andrew Gaffney <agaffney@gentoo.org> 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 <wolf31o2@gentoo.org>
   targets/stage1/stage1-chroot.sh:
   Added patch from Andrew Gaffney <agaffney@gentoo.org> for bug #166426.

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index edf6c6d9f3861d02c405156cbadfa0d234898ec7..bd5c9d5fc2eff5b2a0a435464c70c6e74f73fcb2 100755 (executable)
--- 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(){