We don't need --newuse if we're not using binary packages, so there's no need for...

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

diff --git a/ChangeLog b/ChangeLog
index ba391f229acd76acfb3e0423c552c94ec05ca890..1911f0fb0d68520b33405b484121482dd789ba7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  16 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-chroot.sh:
+  We don't need --newuse if we're not using binary packages, so there's no
+  need for it here.
+
   13 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/livecd-stage2/livecd-stage2-controller.sh:
   Added initial framework for creating the CD's root on livecd/livedvd.

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 13d40aebd9154a6679d2e61f303480ee385f320b..dcd7494e8f6a1704823edc1e3a490b95edf6c4b6 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -33,6 +33,6 @@ make_destpath /tmp/stage1root
 [ -e /etc/make.conf ] && \
        echo "USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"" \
        >> /etc/make.conf
-run_merge "--noreplace --oneshot --newuse ${clst_buildpkgs}"
+run_merge "--noreplace --oneshot ${clst_buildpkgs}"
 sed -i "/USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
        /etc/make.conf