From ba54476f01ebf13709fd38c8047a62614eb0d19d Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 27 Jan 2011 11:33:53 +0100 Subject: [PATCH] Revert "Do not query generated files (like include/config/kernel.release) for kernel version, as they may be out of sync (bug #263927)" This reverts commit 48ca00ec29afdec6cb168fbaae87a7b07ea65988. Conflicts: ChangeLog --- ChangeLog | 5 ++++- gen_determineargs.sh | 31 ++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c072dd..3ab3b5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ # Distributed under the GPL v2 # $Id$ + 27 Jan 2011; Sebastian Pipping gen_determineargs.sh: + Revert kernel release detection fix (regression) (bug #352787) + 23 Jan 2011; Sebastian Pipping genkernel: Bump version to 3.4.12.1 @@ -78,7 +81,7 @@ - devsk (Multi-device patch) - Fabio Erculiani (Slowusb fixes) - Kai Dietrich (Symlink analysis) - - Kolbjørn Barmen (Arithmetic fix) + - Kolbjørn Barmen (Arithmetic fix) 13 Dec 2010; Sebastian Pipping genkernel: Bump version to 3.4.10.908 diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 9cd4be8..a55ccec 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -39,20 +39,29 @@ get_KV() { EXV=`grep ^EXTRAVERSION\ \= ${KERNEL_SOURCE_DIR}/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g" -e 's/\$([a-z]*)//gi'` fi - # Extract local version suffix from .config - # Not, that we explicitly do not look at generated files like - # - include/config/kernel.release - # - include/linux/version.h - # - include/linux/utsrelease.h - # as they require "make prepare" to be up to date (bug #263927) - local future_config="${KERNEL_DIR}"/.config - if isTrue "${MRPROPER}" || [ ! -f "${future_config}" ] + cd ${KERNEL_DIR} + #compile_generic prepare kernel > /dev/null 2>&1 + cd - > /dev/null 2>&1 + [ -f "${KERNEL_DIR}/include/linux/version.h" ] && \ + VERSION_SOURCE="${KERNEL_DIR}/include/linux/version.h" + [ -f "${KERNEL_DIR}/include/linux/utsrelease.h" ] && \ + VERSION_SOURCE="${KERNEL_DIR}/include/linux/utsrelease.h" + # Handle new-style releases where version.h doesn't have UTS_RELEASE + if [ -f ${KERNEL_DIR}/include/config/kernel.release ] then + UTS_RELEASE=`cat ${KERNEL_DIR}/include/config/kernel.release` + LOV=`echo ${UTS_RELEASE}|sed -e "s/${VER}.${PAT}.${SUB}${EXV}//"` + KV=${VER}.${PAT}.${SUB}${EXV}${LOV} + elif [ -n "${VERSION_SOURCE}" ] + then + UTS_RELEASE=`grep UTS_RELEASE ${VERSION_SOURCE} | sed -e 's/#define UTS_RELEASE "\(.*\)"/\1/'` + LOV=`echo ${UTS_RELEASE}|sed -e "s/${VER}.${PAT}.${SUB}${EXV}//"` + KV=${VER}.${PAT}.${SUB}${EXV}${LOV} + else determine_config_file - future_config=${KERNEL_CONFIG} + LCV=`grep ^CONFIG_LOCALVERSION= "${KERNEL_CONFIG}" | sed -r -e "s/.*=\"(.*)\"/\1/"` + KV=${VER}.${PAT}.${SUB}${EXV}${LCV} fi - LOV=`grep ^CONFIG_LOCALVERSION= "${future_config}" | sed -r -e "s/.*=\"(.*)\"/\1/"` - KV=${VER}.${PAT}.${SUB}${EXV}${LOV} fi } -- 2.26.2