1 |
From: "W. Trevor King" <wking@×××××××.us> |
2 |
|
3 |
For users that don't want to specify a seed config. |
4 |
--- |
5 |
targets/support/kmerge.sh | 21 +++++++++++++-------- |
6 |
1 file changed, 13 insertions(+), 8 deletions(-) |
7 |
|
8 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
9 |
index b731373..ce1dddf 100644 |
10 |
--- a/targets/support/kmerge.sh |
11 |
+++ b/targets/support/kmerge.sh |
12 |
@@ -109,8 +109,11 @@ genkernel_compile(){ |
13 |
else |
14 |
genkernel ${GK_ARGS} || exit 1 |
15 |
fi |
16 |
- md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \ |
17 |
- /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG |
18 |
+ if [ -e /var/tmp/${clst_kname}.config ] |
19 |
+ then |
20 |
+ md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \ |
21 |
+ /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG |
22 |
+ fi |
23 |
} |
24 |
|
25 |
build_kernel() { |
26 |
@@ -177,15 +180,17 @@ then |
27 |
fi |
28 |
|
29 |
CONFIG_MATCH=0 |
30 |
-if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ] |
31 |
+if [ -n "${clst_KERNCACHE}" -a |
32 |
+ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ] |
33 |
then |
34 |
- STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG` |
35 |
- STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'` |
36 |
- if [ "${STR1}" = "${STR2}" ] |
37 |
+ if [ ! -e /var/tmp/${clst_kname}.config ] |
38 |
then |
39 |
- if [ -n "${clst_KERNCACHE}" ] |
40 |
+ CONFIG_MATCH=1 |
41 |
+ else |
42 |
+ STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG` |
43 |
+ STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'` |
44 |
+ if [ "${STR1}" = "${STR2}" ] |
45 |
then |
46 |
- #echo "CONFIG match" |
47 |
CONFIG_MATCH=1 |
48 |
fi |
49 |
fi |
50 |
-- |
51 |
1.8.1.336.g94702dd |