OK, we have to escape our quotes, rather than use single quotes, or we don't evaluate...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1336 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 3871185d968150a2a3bcdccdd83ca0bc972f734b..8e035a89e9ffcf0a66935a6535a508814888a9eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # 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:
+  OK, we have to escape our quotes, rather than use single quotes, or we don't
+  evaluate the variables properly.
+
   28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-chroot.sh, targets/support/chroot-functions.sh,
   targets/support/kmerge.sh:

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 170fff882d2e5e209971e15391a0a382acdfe516..151a3637ad74a000623bbe27b879a5cd6577f33d 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -28,7 +28,7 @@ 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} ${HOSTUSE}\"" >> /etc/make.conf
 run_merge "--noreplace --oneshot --newuse ${clst_buildpkgs}"
 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 5ec25179a8f29efbfb9dfea46c4c8437f96cf433..96eeb0610fb310519d26127655d1777f8d60c7d2 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -184,8 +184,8 @@ then
        fi
 fi
 
-[ -e /etc/make.conf ] && echo 'USE="${USE} ${clst_kernel_use} symlink build"' \
-       >> /etc/make.conf
+[ -e /etc/make.conf ] && \
+       echo \"USE="${USE} ${clst_kernel_use} symlink build\"" >> /etc/make.conf
 
 if [ -n "${clst_KERNCACHE}" ]
 then