Fixing echo/sed for make.conf writing.

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

diff --git a/ChangeLog b/ChangeLog
index b9967cd2615283c3deaaabe2983409211c3a4c2e..3871185d968150a2a3bcdccdd83ca0bc972f734b 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/chroot-functions.sh,
+  targets/support/kmerge.sh:
+  Fixing echo/sed for make.conf writing.
+
   28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/grp/grp-chroot.sh, targets/stage1/stage1-chroot.sh,
   targets/support/kmerge.sh, targets/support/livecdfs-update.sh:

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 8476114b5557a09caad7022b44fd1a91ff57a12a..170fff882d2e5e209971e15391a0a382acdfe516 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -22,14 +22,13 @@ fi
 clst_root_path=/ setup_pkgmgr
 
 # First, we drop in a known-good baselayout
-[ -e ${ROOT}/etc/make.conf ] && \
-       echo 'USE="${USE} -build' >> ${ROOT}/etc/make.conf
+[ -e /etc/make.conf ] && \
+       echo 'USE="${USE} -build"' >> /etc/make.conf
 run_merge "--oneshot --nodeps virtual/baselayout"
-sed -i '/USE="${USE} -build/d' ${ROOT}/etc/make.conf
+sed -i '/USE="${USE} -build"/d' /etc/make.conf
 
-[ -e ${ROOT}/etc/make.conf ] && \
-       echo 'USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}"' \
-       >> ${ROOT}/etc/make.conf
+[ -e /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' \
-       ${ROOT}/etc/make.conf
+       /etc/make.conf

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 809a4fcda0a55805a9e545286812ff475ced89a6..de90c1b448e69ad6d470d4bbbf1158a516c6beb2 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -72,9 +72,9 @@ setup_myfeatures(){
                export clst_myfeatures="${clst_myfeatures} distcc"
                export DISTCC_HOSTS="${clst_distcc_hosts}"
                [ -e /etc/make.conf ] && \
-                       echo 'USE="${USE} -avahi -gtk -gnome' >> /etc/make.conf
+                       echo 'USE="${USE} -avahi -gtk -gnome"' >> /etc/make.conf
                clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1
-               sed -i '/USE="${USE} -avahi -gtk -gnome/d' /etc/make.conf
+               sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
                mkdir -p /etc/distcc
                echo "${clst_distcc_hosts}" > /etc/distcc/hosts
 
@@ -154,9 +154,9 @@ setup_pkgmgr(){
        # We need to merge our package manager with USE="build" set in case it is
        # portage to avoid frying our /etc/make.conf file.  Otherwise, we could
        # just let emerge system could merge it.
-       [ -e /etc/make.conf ] && echo 'USE="${USE} build' >> /etc/make.conf
+       [ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf
        run_merge --oneshot --nodeps virtual/portage
-       sed -i '/USE="${USE} build/d' /etc/make.conf
+       sed -i '/USE="${USE} build"/d' /etc/make.conf
 }
 
 cleanup_distcc() {

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index b5fa5221ad15ab2e819bdd6827291141fc186d45..5ec25179a8f29efbfb9dfea46c4c8437f96cf433 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -184,7 +184,7 @@ then
        fi
 fi
 
-[ -e /etc/make.conf ] && echo 'USE="${USE} ${clst_kernel_use} symlink build' \
+[ -e /etc/make.conf ] && echo 'USE="${USE} ${clst_kernel_use} symlink build"' \
        >> /etc/make.conf
 
 if [ -n "${clst_KERNCACHE}" ]
@@ -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