aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2011-01-27 11:46:26 +0100
committerSebastian Pipping <sebastian@pipping.org>2011-01-27 11:46:26 +0100
commitd5501e7bbde455c05c1bbd82f0871f1f508eb935 (patch)
tree28e128835b7c5af35c35d1691243c9185916fbcd
parentdocs: Fix sample call to GnuPG (reported by Fabio Coatti) (diff)
parentBump version to 3.4.12.2 (diff)
downloadgenkernel-d5501e7bbde455c05c1bbd82f0871f1f508eb935.tar.gz
genkernel-d5501e7bbde455c05c1bbd82f0871f1f508eb935.tar.bz2
genkernel-d5501e7bbde455c05c1bbd82f0871f1f508eb935.zip
Merge branch 'master' into experimental
-rw-r--r--ChangeLog8
-rwxr-xr-xgen_determineargs.sh31
-rwxr-xr-xgenkernel2
3 files changed, 28 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c072dd..db31f4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@
# Distributed under the GPL v2
# $Id$
+ 27 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
+ Bump version to 3.4.12.2
+
+ 27 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_determineargs.sh:
+ Revert kernel release detection fix (regression) (bug #352787)
+
23 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
Bump version to 3.4.12.1
@@ -78,7 +84,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 <sping@gentoo.org> 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
}
diff --git a/genkernel b/genkernel
index b6d93c9..a450bc3 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
# $Id$
PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.12.1'
+GK_V='3.4.12.2'
# Set the default for TMPDIR. May be modified by genkernel.conf or the
# --tempdir command line option.