kmerge.sh: Fix line wrapping typo from 9ceebbf

[catalyst.git] / targets / support / kmerge.sh

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index b4d67d88d20ba3e057e405b2f5590aa4986146ab..e78e0b494e4d5db8a8dd765915e46c5fa157eaab 100644 (file)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -60,7 +60,7 @@ setup_gk_args() {
                GK_ARGS="${GK_ARGS} --busybox-config=/tmp/busy-config"
        fi
 
-       if [ "${clst_target}" == "netboot" ]
+       if [ "${clst_target}" == "netboot2" ]
        then
                GK_ARGS="${GK_ARGS} --netboot"
 
@@ -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,22 +180,24 @@ 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
 fi
 
-[ -e /etc/make.conf ] && \
-       echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> /etc/make.conf
+[ -e /etc/portage/make.conf ] && \
+       echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> /etc/portage/make.conf
 
 if [ -n "${clst_KERNCACHE}" ]
 then
@@ -232,7 +237,7 @@ then
 fi
 
 build_kernel
-sed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/make.conf
+sed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/portage/make.conf
 # grep out the kernel version so that we can do our modules magic
 VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
 PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`