[patch] Patch fixing the problem

linux-info_eclass-bug_331467.patch (text/plain), 2.10 KB, created by Guenther Brunthaler on 2010-08-07 02:52:55 UTC

--- linux-info.eclass.orig	2010-08-07 02:31:25.000000000 +0000
+++ linux-info.eclass	2010-08-07 02:35:27.000000000 +0000
@@ -539,25 +539,31 @@
 	# and if we STILL have not got it, then we better just set it to KV_DIR
 	KV_OUT_DIR="${KV_OUT_DIR:-${KV_DIR}}"
 
-	if linux_config_src_exists; then
-		# For things like git that can append extra stuff:
-		# This script is NOT posix-compliant. Running it with 'sh' when 'sh'
-		# is a real POSIX shell causes some breakages (bug #323717).
-		if [ -e ${KV_DIR}/scripts/setlocalversion ] ; then
-			KV_LOCAL="${KV_LOCAL}$(cd ${KV_OUT_DIR} ; bash ${KV_DIR}/scripts/setlocalversion ${KV_DIR})"
-		else
-			# localversion* files
-			KV_LOCAL="${KV_LOCAL}$(get_localversion ${KV_DIR})"
-
-			# CONFIG_LOCALVERSION + LOCALVERSION
-			KV_LOCAL="${KV_LOCAL}$(linux_chkconfig_string LOCALVERSION)${LOCALVERSION}"
-			KV_LOCAL="${KV_LOCAL//\"/}"
-
-			# CONFIG_LOCALVERSION_AUTO logic ???
+	# Fix for bug # 331467 - blame Guenther Brunthaler <[e-mail]> for any problems!
+	KV_LOCAL="$(
+		set -e
+		KERNELVERSION=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}
+		test -n "$KERNELVERSION"
+		KERNELRELEASE=$(cat "${KV_OUT_DIR}"/include/config/kernel.release 2> /dev/null)
+		test -n "$KERNELRELEASE"
+		LOCALVERSION=${KERNELRELEASE#"${KERNELVERSION}"}
+		test x"${KERNELVERSION}${LOCALVERSION}" = x"${KERNELRELEASE}"
+		printf '?%s\n' "${LOCALVERSION}"
+	)"
+	test x"?${KV_LOCAL#?}" = x"${KV_LOCAL}" || {
+		if [ -z "${get_version_warning_done}" ]; then
+			get_version_warning_done=1
+			qeerror "Could not detect kernel release name."
+			qeerror "Please ensure that \"make kernelrelease\", when run from"
+			qeerror "directory \"${KV_OUT_DIR}\", reports"
+			qeerror "a valid kernel release name!"
+			qeerror "If it does not, maybe you forgot to run \"make oldconfig\""
+			qeerror "or \"make menuconfig\" there before?"
 		fi
-	else
-		KV_LOCAL="${KV_LOCAL}$(get_localversion ${KV_DIR})"
-	fi
+		return 1
+	}
+	KV_LOCAL=${KV_LOCAL#?}
+	# End of fix for bug # 331467.
 
 	# And we should set KV_FULL to the full expanded version
 	KV_FULL="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}${KV_LOCAL}"