[patch] fixes CONFIG_LOCALVERSION and "3.1.5" should be "3.1.6" problems.

genkernel-localversion.patch (text/plain), 1.57 KB, created by Daniel Holth on 2005-05-28 18:11:48 UTC

diff -r -u genkernel-3.1.6/gen_determineargs.sh genkernel-3.1.6-dwh/gen_determineargs.sh
--- genkernel-3.1.6/gen_determineargs.sh	2005-03-13 07:55:51.000000000 -0500
+++ genkernel-3.1.6-dwh/gen_determineargs.sh	2005-05-28 20:50:46.000000000 -0400
@@ -3,12 +3,17 @@
 get_KV() {
 	local SUB
 	local EXV
+	local LOV
 	
 	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 };'`
 	EXV=`grep ^EXTRAVERSION\ \= ${KERNEL_DIR}/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g"`
-	KV=${VER}.${PAT}.${SUB}${EXV}
+	LOV=`grep ^CONFIG_LOCALVERSION\= ${KERNEL_DIR}/.config | sed -e "s/CONFIG_LOCALVERSION=\"\(.*\)\"/\1/"`
+
+	echo localversion is ${LOV}
+
+	KV=${VER}.${PAT}.${SUB}${EXV}${LOV}
 }
 
 determine_real_args() {
diff -r -u genkernel-3.1.6/genkernel genkernel-3.1.6-dwh/genkernel
--- genkernel-3.1.6/genkernel	2005-03-13 07:55:51.000000000 -0500
+++ genkernel-3.1.6-dwh/genkernel	2005-05-28 21:02:03.000000000 -0400
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V='3.1.5'
+GK_V='3.1.6'
 TEMP='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.
 
@@ -143,6 +143,13 @@
 then
 	# Configure kernel
 	config_kernel
+	
+	# Kernel config may have changed CONFIG_LOCALVERSION
+	KV_PRECONFIG=${KV}
+	get_KV
+	if [ ${KV} != ${KV_PRECONFIG} ] ; then
+		NORMAL=${BOLD} print_info 1 "Kernel version changed from ${BOLD}${KV_PRECONFIG}${NORMAL} to ${BOLD}${KV}${NORMAL} during config."
+	fi
 
 	# Make deps
 	compile_dep