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 befebd2c7be7be0e74654abd2ffbacd1c34c3e92..ae432c0943c3b577fbd1f282a8137e50417f0afa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-chroot.sh, targets/support/kmerge.sh:
+  Fix our USE invocation here so things work as expected.
+
   28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   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 61cb92b49efa51073d4315b102488e294168beb7..186171d4727745929cf102b8527d6aad1269a2de 100755 (executable)
--- 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 96eeb0610fb310519d26127655d1777f8d60c7d2..70c3b5c675fb065c64719f1cb26d00fb9aafe7cd 100755 (executable)
--- 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