| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-02-28 04:33:14 +0000 (Thu, 28 Feb 2008) |
| 3 |
New Revision: 1335 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/stage1/stage1-chroot.sh |
| 8 |
trunk/targets/support/chroot-functions.sh |
| 9 |
trunk/targets/support/kmerge.sh |
| 10 |
Log: |
| 11 |
Fixing echo/sed for make.conf writing. |
| 12 |
|
| 13 |
Modified: trunk/ChangeLog |
| 14 |
=================================================================== |
| 15 |
--- trunk/ChangeLog 2008-02-28 04:26:14 UTC (rev 1334) |
| 16 |
+++ trunk/ChangeLog 2008-02-28 04:33:14 UTC (rev 1335) |
| 17 |
@@ -2,6 +2,11 @@ |
| 18 |
# $Id: $ |
| 19 |
|
| 20 |
28 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 21 |
+ targets/stage1/stage1-chroot.sh, targets/support/chroot-functions.sh, |
| 22 |
+ targets/support/kmerge.sh: |
| 23 |
+ Fixing echo/sed for make.conf writing. |
| 24 |
+ |
| 25 |
+ 28 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 26 |
targets/grp/grp-chroot.sh, targets/stage1/stage1-chroot.sh, |
| 27 |
targets/support/kmerge.sh, targets/support/livecdfs-update.sh: |
| 28 |
Rather than using the environment, we write out our USE to make.conf, then |
| 29 |
|
| 30 |
Modified: trunk/targets/stage1/stage1-chroot.sh |
| 31 |
=================================================================== |
| 32 |
--- trunk/targets/stage1/stage1-chroot.sh 2008-02-28 04:26:14 UTC (rev 1334) |
| 33 |
+++ trunk/targets/stage1/stage1-chroot.sh 2008-02-28 04:33:14 UTC (rev 1335) |
| 34 |
@@ -22,14 +22,13 @@ |
| 35 |
clst_root_path=/ setup_pkgmgr |
| 36 |
|
| 37 |
# First, we drop in a known-good baselayout |
| 38 |
-[ -e ${ROOT}/etc/make.conf ] && \ |
| 39 |
- echo 'USE="${USE} -build' >> ${ROOT}/etc/make.conf |
| 40 |
+[ -e /etc/make.conf ] && \ |
| 41 |
+ echo 'USE="${USE} -build"' >> /etc/make.conf |
| 42 |
run_merge "--oneshot --nodeps virtual/baselayout" |
| 43 |
-sed -i '/USE="${USE} -build/d' ${ROOT}/etc/make.conf |
| 44 |
+sed -i '/USE="${USE} -build"/d' /etc/make.conf |
| 45 |
|
| 46 |
-[ -e ${ROOT}/etc/make.conf ] && \ |
| 47 |
- echo 'USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}"' \ |
| 48 |
- >> ${ROOT}/etc/make.conf |
| 49 |
+[ -e /etc/make.conf ] && \ |
| 50 |
+ echo 'USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}"' >> /etc/make.conf |
| 51 |
run_merge "--noreplace --oneshot --newuse ${clst_buildpkgs}" |
| 52 |
sed -i '/USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}"/d' \ |
| 53 |
- ${ROOT}/etc/make.conf |
| 54 |
+ /etc/make.conf |
| 55 |
|
| 56 |
Modified: trunk/targets/support/chroot-functions.sh |
| 57 |
=================================================================== |
| 58 |
--- trunk/targets/support/chroot-functions.sh 2008-02-28 04:26:14 UTC (rev 1334) |
| 59 |
+++ trunk/targets/support/chroot-functions.sh 2008-02-28 04:33:14 UTC (rev 1335) |
| 60 |
@@ -72,9 +72,9 @@ |
| 61 |
export clst_myfeatures="${clst_myfeatures} distcc" |
| 62 |
export DISTCC_HOSTS="${clst_distcc_hosts}" |
| 63 |
[ -e /etc/make.conf ] && \ |
| 64 |
- echo 'USE="${USE} -avahi -gtk -gnome' >> /etc/make.conf |
| 65 |
+ echo 'USE="${USE} -avahi -gtk -gnome"' >> /etc/make.conf |
| 66 |
clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1 |
| 67 |
- sed -i '/USE="${USE} -avahi -gtk -gnome/d' /etc/make.conf |
| 68 |
+ sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf |
| 69 |
mkdir -p /etc/distcc |
| 70 |
echo "${clst_distcc_hosts}" > /etc/distcc/hosts |
| 71 |
|
| 72 |
@@ -154,9 +154,9 @@ |
| 73 |
# We need to merge our package manager with USE="build" set in case it is |
| 74 |
# portage to avoid frying our /etc/make.conf file. Otherwise, we could |
| 75 |
# just let emerge system could merge it. |
| 76 |
- [ -e /etc/make.conf ] && echo 'USE="${USE} build' >> /etc/make.conf |
| 77 |
+ [ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf |
| 78 |
run_merge --oneshot --nodeps virtual/portage |
| 79 |
- sed -i '/USE="${USE} build/d' /etc/make.conf |
| 80 |
+ sed -i '/USE="${USE} build"/d' /etc/make.conf |
| 81 |
} |
| 82 |
|
| 83 |
cleanup_distcc() { |
| 84 |
|
| 85 |
Modified: trunk/targets/support/kmerge.sh |
| 86 |
=================================================================== |
| 87 |
--- trunk/targets/support/kmerge.sh 2008-02-28 04:26:14 UTC (rev 1334) |
| 88 |
+++ trunk/targets/support/kmerge.sh 2008-02-28 04:33:14 UTC (rev 1335) |
| 89 |
@@ -184,7 +184,7 @@ |
| 90 |
fi |
| 91 |
fi |
| 92 |
|
| 93 |
-[ -e /etc/make.conf ] && echo 'USE="${USE} ${clst_kernel_use} symlink build' \ |
| 94 |
+[ -e /etc/make.conf ] && echo 'USE="${USE} ${clst_kernel_use} symlink build"' \ |
| 95 |
>> /etc/make.conf |
| 96 |
|
| 97 |
if [ -n "${clst_KERNCACHE}" ] |
| 98 |
@@ -196,7 +196,7 @@ |
| 99 |
else |
| 100 |
run_emerge "${clst_ksource}" || exit 1 |
| 101 |
fi |
| 102 |
-sed -i '/USE="${USE} ${clst_kernel_use} symlink build/d' /etc/make.conf |
| 103 |
+sed -i '/USE="${USE} ${clst_kernel_use} symlink build"/d' /etc/make.conf |
| 104 |
|
| 105 |
# If catalyst has set to a empty string, extraversion wasn't specified so we |
| 106 |
# skip this part |
| 107 |
|
| 108 |
-- |
| 109 |
gentoo-commits@l.g.o mailing list |
Archives