From: Andrew Gaffney Date: Tue, 20 Jan 2009 22:44:42 +0000 (-0600) Subject: Remove --noreplace from run_merge call so that baselayout gets rebuilt with USE=build X-Git-Tag: CATALYST_2_0_6_916~40 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ac6127860ba28b9b788fe828732a21cbc5c195d;p=catalyst.git Remove --noreplace from run_merge call so that baselayout gets rebuilt with USE=build --- diff --git a/ChangeLog b/ChangeLog index fc2a044d..76836c62 100644 --- 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 + targets/stage1/stage1-chroot.sh: + Remove --noreplace from run_merge call so that baselayout gets rebuilt + with USE=build + 16 Jan 2009; Andrew Gaffney 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 dcd7494e..c3ab2ec3 100644 --- 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