From: Chris Gianelloni Date: Thu, 28 Feb 2008 17:24:31 +0000 (+0000) Subject: Fix our USE invocation here so things work as expected. X-Git-Tag: CATALYST_2_0_6_916~153 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c2653f7f149ceedfe42a2a489a81c13fb43c3653;p=catalyst.git Fix our USE invocation here so things work as expected. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1341 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index befebd2c..ae432c09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 28 Feb 2008; Chris Gianelloni + targets/stage1/stage1-chroot.sh, targets/support/kmerge.sh: + Fix our USE invocation here so things work as expected. + 28 Feb 2008; Chris Gianelloni targets/support/livecdfs-update.sh: Force-enable livecd/users for livecd/type gentoo-release-livecd and diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 61cb92b4..186171d4 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -31,5 +31,5 @@ sed -i '/USE="${USE} -build"/d' /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' \ +sed -i "/USE=\"-* bindist build ${STAGE1_USE} ${HOSTUSE}\"/d" \ /etc/make.conf diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 96eeb061..70c3b5c6 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -185,7 +185,7 @@ then fi [ -e /etc/make.conf ] && \ - echo \"USE="${USE} ${clst_kernel_use} symlink build\"" >> /etc/make.conf + echo \"USE="\${USE} ${clst_kernel_use} symlink build\"" >> /etc/make.conf if [ -n "${clst_KERNCACHE}" ] then @@ -196,7 +196,7 @@ mkdir -p /tmp/kerncache/${clst_kname} else run_emerge "${clst_ksource}" || exit 1 fi -sed -i '/USE="${USE} ${clst_kernel_use} symlink build"/d' /etc/make.conf +sed -i "/USE=\"\${USE} ${clst_kernel_use} symlink build\"/d" /etc/make.conf # If catalyst has set to a empty string, extraversion wasn't specified so we # skip this part