* [gentoo-commits] catalyst r1341 - in trunk: . targets/stage1 targets/support
@ 2008-02-28 17:24 99% Chris Gianelloni (wolf31o2)
0 siblings, 0 replies; 1+ results
From: Chris Gianelloni (wolf31o2) @ 2008-02-28 17:24 UTC (permalink / raw
To: gentoo-commits
Author: wolf31o2
Date: 2008-02-28 17:24:31 +0000 (Thu, 28 Feb 2008)
New Revision: 1341
Modified:
trunk/ChangeLog
trunk/targets/stage1/stage1-chroot.sh
trunk/targets/support/kmerge.sh
Log:
Fix our USE invocation here so things work as expected.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-02-28 17:10:37 UTC (rev 1340)
+++ trunk/ChangeLog 2008-02-28 17:24:31 UTC (rev 1341)
@@ -2,6 +2,10 @@
# $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
gentoo-gamecd.
Modified: trunk/targets/stage1/stage1-chroot.sh
===================================================================
--- trunk/targets/stage1/stage1-chroot.sh 2008-02-28 17:10:37 UTC (rev 1340)
+++ trunk/targets/stage1/stage1-chroot.sh 2008-02-28 17:24:31 UTC (rev 1341)
@@ -31,5 +31,5 @@
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
Modified: trunk/targets/support/kmerge.sh
===================================================================
--- trunk/targets/support/kmerge.sh 2008-02-28 17:10:37 UTC (rev 1340)
+++ trunk/targets/support/kmerge.sh 2008-02-28 17:24:31 UTC (rev 1341)
@@ -185,7 +185,7 @@
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 @@
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
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2008-02-28 17:24 99% [gentoo-commits] catalyst r1341 - in trunk: . targets/stage1 targets/support Chris Gianelloni (wolf31o2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox