| 1 |
Author: agaffney |
| 2 |
Date: 2008-02-29 15:57:27 +0000 (Fri, 29 Feb 2008) |
| 3 |
New Revision: 1344 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/support/kmerge.sh |
| 8 |
Log: |
| 9 |
Change remaining instances of run_emerge to run_merge |
| 10 |
|
| 11 |
Modified: trunk/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- trunk/ChangeLog 2008-02-28 17:59:42 UTC (rev 1343) |
| 14 |
+++ trunk/ChangeLog 2008-02-29 15:57:27 UTC (rev 1344) |
| 15 |
@@ -1,6 +1,10 @@ |
| 16 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 17 |
# $Id: $ |
| 18 |
|
| 19 |
+ 29 Feb 2008; Andrew Gaffney <agaffney@g.o> |
| 20 |
+ targets/support/kmerge.sh: |
| 21 |
+ Change remaining instances of run_emerge to run_merge |
| 22 |
+ |
| 23 |
28 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 24 |
targets/support/bootloader-setup.sh, targets/support/create-iso.sh: |
| 25 |
Change all clst_hostuse checks for ppc/ppc64 to ppc*|powerpc* so we match, |
| 26 |
|
| 27 |
Modified: trunk/targets/support/kmerge.sh |
| 28 |
=================================================================== |
| 29 |
--- trunk/targets/support/kmerge.sh 2008-02-28 17:59:42 UTC (rev 1343) |
| 30 |
+++ trunk/targets/support/kmerge.sh 2008-02-29 15:57:27 UTC (rev 1344) |
| 31 |
@@ -190,11 +190,11 @@ |
| 32 |
if [ -n "${clst_KERNCACHE}" ] |
| 33 |
then |
| 34 |
mkdir -p /tmp/kerncache/${clst_kname} |
| 35 |
- ROOT=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_emerge --nodeps -uqkb "${clst_ksource}" || exit 1 |
| 36 |
+ ROOT=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} run_merge --nodeps -uqkb "${clst_ksource}" || exit 1 |
| 37 |
[ -l /usr/src/linux ] && rm -f /usr/src/linux |
| 38 |
ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux |
| 39 |
else |
| 40 |
- run_emerge "${clst_ksource}" || exit 1 |
| 41 |
+ run_merge "${clst_ksource}" || exit 1 |
| 42 |
fi |
| 43 |
sed -i "/USE=\"\${USE} ${clst_kernel_use} symlink build\"/d" /etc/make.conf |
| 44 |
|
| 45 |
|
| 46 |
-- |
| 47 |
gentoo-commits@l.g.o mailing list |
Archives