| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-03-05 16:12:29 +0000 (Wed, 05 Mar 2008) |
| 3 |
New Revision: 1352 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/catalyst |
| 8 |
trunk/targets/support/kmerge.sh |
| 9 |
Log: |
| 10 |
Added an additional make_destpath call to kmerge.sh so it'll export ROOT=/ prior to running genkernel. This is catalyst 2.0.6_pre11 for testing. |
| 11 |
|
| 12 |
Modified: trunk/ChangeLog |
| 13 |
=================================================================== |
| 14 |
--- trunk/ChangeLog 2008-03-04 02:37:23 UTC (rev 1351) |
| 15 |
+++ trunk/ChangeLog 2008-03-05 16:12:29 UTC (rev 1352) |
| 16 |
@@ -1,6 +1,11 @@ |
| 17 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 18 |
# $Id: $ |
| 19 |
|
| 20 |
+ 05 Mar 2008; Chris Gianelloni <wolf31o2@g.o> catalyst, |
| 21 |
+ targets/support/kmerge.sh: |
| 22 |
+ Added an additional make_destpath call to kmerge.sh so it'll export ROOT=/ |
| 23 |
+ prior to running genkernel. This is catalyst 2.0.6_pre11 for testing. |
| 24 |
+ |
| 25 |
04 Mar 2008; Andrew Gaffney <agaffney@g.o> |
| 26 |
targets/support/create-iso.sh: |
| 27 |
Bash fscking sucks, so we have to compromise on this code reduction solution |
| 28 |
@@ -12,7 +17,7 @@ |
| 29 |
|
| 30 |
02 Mar 2008; Andrew Gaffney <agaffney@g.o> |
| 31 |
targets/support/kmerge.sh: |
| 32 |
- Pass clst_root_path instead of ROOT to run_emerge, since it overrides ROOT |
| 33 |
+ Pass clst_root_path instead of ROOT to run_merge, since it overrides ROOT |
| 34 |
|
| 35 |
29 Feb 2008; Andrew Gaffney <agaffney@g.o> |
| 36 |
targets/support/kmerge.sh: |
| 37 |
|
| 38 |
Modified: trunk/catalyst |
| 39 |
=================================================================== |
| 40 |
--- trunk/catalyst 2008-03-04 02:37:23 UTC (rev 1351) |
| 41 |
+++ trunk/catalyst 2008-03-05 16:12:29 UTC (rev 1352) |
| 42 |
@@ -8,7 +8,7 @@ |
| 43 |
import pdb |
| 44 |
|
| 45 |
__maintainer__="Chris Gianelloni <wolf31o2@g.o>" |
| 46 |
-__version__="2.0.6_pre10" |
| 47 |
+__version__="2.0.6_pre11" |
| 48 |
|
| 49 |
conf_values={} |
| 50 |
|
| 51 |
|
| 52 |
Modified: trunk/targets/support/kmerge.sh |
| 53 |
=================================================================== |
| 54 |
--- trunk/targets/support/kmerge.sh 2008-03-04 02:37:23 UTC (rev 1351) |
| 55 |
+++ trunk/targets/support/kmerge.sh 2008-03-05 16:12:29 UTC (rev 1352) |
| 56 |
@@ -63,7 +63,6 @@ |
| 57 |
then |
| 58 |
GK_ARGS="${GK_ARGS} --initramfs-overlay=\"${clst_merge_path}\"" |
| 59 |
fi |
| 60 |
- |
| 61 |
} |
| 62 |
|
| 63 |
genkernel_compile(){ |
| 64 |
@@ -101,7 +100,8 @@ |
| 65 |
else |
| 66 |
genkernel ${GK_ARGS} || exit 1 |
| 67 |
fi |
| 68 |
- md5sum /var/tmp/${clst_kname}.config|awk '{print $1}' > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG |
| 69 |
+ md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \ |
| 70 |
+ /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG |
| 71 |
} |
| 72 |
|
| 73 |
build_kernel() { |
| 74 |
@@ -196,6 +196,7 @@ |
| 75 |
else |
| 76 |
run_merge "${clst_ksource}" || exit 1 |
| 77 |
fi |
| 78 |
+make_destpath |
| 79 |
sed -i "/USE=\"\${USE} ${clst_kernel_use} symlink build\"/d" /etc/make.conf |
| 80 |
|
| 81 |
# If catalyst has set to a empty string, extraversion wasn't specified so we |
| 82 |
|
| 83 |
-- |
| 84 |
gentoo-commits@l.g.o mailing list |
Archives