From: Chris Gianelloni Date: Thu, 28 Feb 2008 04:47:29 +0000 (+0000) Subject: Fix HOSTUSE invocation on stage1, since we use -* at the beginning to disable profile... X-Git-Tag: CATALYST_2_0_6_916~157 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6b41a794239f9a4c2da7fc3a94554f5b33b438f3;p=catalyst.git Fix HOSTUSE invocation on stage1, since we use -* at the beginning to disable profile USE. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1337 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 8e035a89..d1eaa715 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 28 Feb 2008; Chris Gianelloni + targets/stage1/stage1-chroot.sh: + Fix HOSTUSE invocation on stage1, since we use -* at the beginning to + disable profile USE. + 28 Feb 2008; Chris Gianelloni targets/stage1/stage1-chroot.sh, targets/support/kmerge.sh: OK, we have to escape our quotes, rather than use single quotes, or we don't diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 151a3637..61cb92b4 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -28,7 +28,8 @@ run_merge "--oneshot --nodeps virtual/baselayout" sed -i '/USE="${USE} -build"/d' /etc/make.conf [ -e /etc/make.conf ] && \ - echo "USE=\"-* bindist build ${STAGE1_USE} ${HOSTUSE}\"" >> /etc/make.conf + echo "USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"" \ + >> /etc/make.conf run_merge "--noreplace --oneshot --newuse ${clst_buildpkgs}" sed -i '/USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}"/d' \ /etc/make.conf