From da48b487ce40fb9b6f195098a143025ea9cdc5b1 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 16 Apr 2008 17:59:58 +0000 Subject: [PATCH] We don't need --newuse if we're not using binary packages, so there's no need for it here. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1396 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ targets/stage1/stage1-chroot.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ba391f22..1911f0fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 16 Apr 2008; Chris Gianelloni + 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 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 13d40aeb..dcd7494e 100755 --- 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 -- 2.26.2