| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-02-28 17:24:31 +0000 (Thu, 28 Feb 2008) |
| 3 |
New Revision: 1341 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/stage1/stage1-chroot.sh |
| 8 |
trunk/targets/support/kmerge.sh |
| 9 |
Log: |
| 10 |
Fix our USE invocation here so things work as expected. |
| 11 |
|
| 12 |
Modified: trunk/ChangeLog |
| 13 |
=================================================================== |
| 14 |
--- trunk/ChangeLog 2008-02-28 17:10:37 UTC (rev 1340) |
| 15 |
+++ trunk/ChangeLog 2008-02-28 17:24:31 UTC (rev 1341) |
| 16 |
@@ -2,6 +2,10 @@ |
| 17 |
# $Id: $ |
| 18 |
|
| 19 |
28 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 20 |
+ targets/stage1/stage1-chroot.sh, targets/support/kmerge.sh: |
| 21 |
+ Fix our USE invocation here so things work as expected. |
| 22 |
+ |
| 23 |
+ 28 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 24 |
targets/support/livecdfs-update.sh: |
| 25 |
Force-enable livecd/users for livecd/type gentoo-release-livecd and |
| 26 |
gentoo-gamecd. |
| 27 |
|
| 28 |
Modified: trunk/targets/stage1/stage1-chroot.sh |
| 29 |
=================================================================== |
| 30 |
--- trunk/targets/stage1/stage1-chroot.sh 2008-02-28 17:10:37 UTC (rev 1340) |
| 31 |
+++ trunk/targets/stage1/stage1-chroot.sh 2008-02-28 17:24:31 UTC (rev 1341) |
| 32 |
@@ -31,5 +31,5 @@ |
| 33 |
echo "USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"" \ |
| 34 |
>> /etc/make.conf |
| 35 |
run_merge "--noreplace --oneshot --newuse ${clst_buildpkgs}" |
| 36 |
-sed -i '/USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}"/d' \ |
| 37 |
+sed -i "/USE=\"-* bindist build ${STAGE1_USE} ${HOSTUSE}\"/d" \ |
| 38 |
/etc/make.conf |
| 39 |
|
| 40 |
Modified: trunk/targets/support/kmerge.sh |
| 41 |
=================================================================== |
| 42 |
--- trunk/targets/support/kmerge.sh 2008-02-28 17:10:37 UTC (rev 1340) |
| 43 |
+++ trunk/targets/support/kmerge.sh 2008-02-28 17:24:31 UTC (rev 1341) |
| 44 |
@@ -185,7 +185,7 @@ |
| 45 |
fi |
| 46 |
|
| 47 |
[ -e /etc/make.conf ] && \ |
| 48 |
- echo \"USE="${USE} ${clst_kernel_use} symlink build\"" >> /etc/make.conf |
| 49 |
+ echo \"USE="\${USE} ${clst_kernel_use} symlink build\"" >> /etc/make.conf |
| 50 |
|
| 51 |
if [ -n "${clst_KERNCACHE}" ] |
| 52 |
then |
| 53 |
@@ -196,7 +196,7 @@ |
| 54 |
else |
| 55 |
run_emerge "${clst_ksource}" || exit 1 |
| 56 |
fi |
| 57 |
-sed -i '/USE="${USE} ${clst_kernel_use} symlink build"/d' /etc/make.conf |
| 58 |
+sed -i "/USE=\"\${USE} ${clst_kernel_use} symlink build\"/d" /etc/make.conf |
| 59 |
|
| 60 |
# If catalyst has set to a empty string, extraversion wasn't specified so we |
| 61 |
# skip this part |
| 62 |
|
| 63 |
-- |
| 64 |
gentoo-commits@l.g.o mailing list |
Archives