[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     9ceebbfdeac3626d52641c195f09297041298341
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Sat Feb  9 20:45:38 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Feb 23 02:02:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9ceebbfd

kmerge.sh: Make /var/tmp/${clst_kname}.config optional

For users that don't want to specify a seed config.

Reviewed-by: Matt Turner <mattst88 <AT> gmail.com>

---
 targets/support/kmerge.sh |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index b731373..ce1dddf 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -109,8 +109,11 @@ genkernel_compile(){
 	else
 		genkernel ${GK_ARGS} || exit 1
 	fi
-	md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \
-		/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG
+	if [ -e /var/tmp/${clst_kname}.config ]
+	then
+		md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \
+			/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG
+	fi
 }
 
 build_kernel() {
@@ -177,15 +180,17 @@ then
 fi
 
 CONFIG_MATCH=0
-if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ]
+if [ -n "${clst_KERNCACHE}" -a
+     -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ]
 then
-	STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG`
-	STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'`
-	if [ "${STR1}" = "${STR2}" ]
+	if [ ! -e /var/tmp/${clst_kname}.config ]
 	then
-		if [ -n "${clst_KERNCACHE}" ]
+		CONFIG_MATCH=1
+	else
+		STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG`
+		STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'`
+		if [ "${STR1}" = "${STR2}" ]
 		then
-			#echo "CONFIG match"
 			CONFIG_MATCH=1
 		fi
 	fi