From: Sebastian Pipping <sebastian@pipping.org>
Date: Thu, 13 Jan 2011 13:30:45 +0000 (+0100)
Subject: Handle missing kernel Makefile better
X-Git-Tag: v3.4.11~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fee837bba64a90f32753cdb99e9e5e0118529b2a;p=genkernel.git

Handle missing kernel Makefile better
---

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index d34e5bc..f830c48 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -20,6 +20,11 @@ get_KV() {
 		# Configure the kernel
 		# If BUILD_KERNEL=0 then assume --no-clean, menuconfig is cleared
 
+		if [ ! -f "${KERNEL_DIR}"/Makefile ]
+		then
+			gen_die "Kernel Makefile (${KERNEL_DIR}/Makefile) missing.  Maybe re-install the kernel sources."
+		fi
+
 		VER=`grep ^VERSION\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'`
 		PAT=`grep ^PATCHLEVEL\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'`
 		SUB=`grep ^SUBLEVEL\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'`
@@ -29,6 +34,7 @@ get_KV() {
 		then
 			# Handle O= build directories
 			KERNEL_SOURCE_DIR=`grep ^MAKEARGS\ \:\=  ${KERNEL_DIR}/Makefile | awk '{ print $4 };'`
+			[ -z "${KERNEL_SOURCE_DIR}" ] && gen_die "Deriving \${KERNEL_SOURCE_DIR} failed"
 			SUB=`grep ^SUBLEVEL\ \= ${KERNEL_SOURCE_DIR}/Makefile | awk '{ print $3 };'`
 			EXV=`grep ^EXTRAVERSION\ \= ${KERNEL_SOURCE_DIR}/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g" -e 's/\$([a-z]*)//gi'`
 		fi