Remove --noreplace from run_merge call so that baselayout gets rebuilt with USE=build

diff --git a/ChangeLog b/ChangeLog
index 728b91f73fae82ecced706ef8e4dfd24110a7127..3f06ed45cc0738e2299c28baf672514d5674e373 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  20 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
+  targets/stage1/stage1-chroot.sh:
+  Remove --noreplace from run_merge call so that baselayout gets rebuilt
+  with USE=build
+
   16 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/rc-update.sh:
   Change invalid atom '>=sys-apps/baselayout-2*' to

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index dcd7494e8f6a1704823edc1e3a490b95edf6c4b6..c3ab2ec377d3f2cfabc5e0c5a6ad028648ff1a51 100644 (file)
--- 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 ${clst_buildpkgs}"
+run_merge "--oneshot ${clst_buildpkgs}"
 sed -i "/USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
        /etc/make.conf