From: Andrew Gaffney <agaffney@gentoo.org>
Date: Sat, 15 Nov 2008 16:00:04 +0000 (-0600)
Subject: Added modified version of patch from gentoo bug #238707
X-Git-Tag: v3.4.10.902~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8de731164496d09384d8be81a3f22316230deb65;p=genkernel.git

Added modified version of patch from gentoo bug #238707
---

diff --git a/ChangeLog b/ChangeLog
index ac7072d..7927168 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  15 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_determineargs.sh:
+  Added modified version of patch from gentoo bug #238707
+
   14 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
   Only append unionfs_fuse stuff if UNIONFS is set
 
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 85b137b..0fd2e7d 100644
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -23,6 +23,15 @@ get_KV() {
 		PAT=`grep ^PATCHLEVEL\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'`
 		SUB=`grep ^SUBLEVEL\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'`
 		EXV=`grep ^EXTRAVERSION\ \= ${KERNEL_DIR}/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g" -e 's/\$([a-z]*)//gi'`
+
+		if [ -z "${SUB}" ]; 
+		then
+			# Handle O= build directories
+			KERNEL_SOURCE_DIR=`grep ^MAKEARGS\ \:\=  ${KERNEL_DIR}/Makefile | awk '{ print $4 };'`
+			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
+
 		cd ${KERNEL_DIR}
 		#compile_generic prepare kernel > /dev/null 2>&1
 		cd - > /dev/null 2>&1