summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChase Maupin <Chase.Maupin@ti.com>2013-04-10 16:51:43 -0500
committerDenys Dmytriyenko <denys@ti.com>2013-04-17 20:18:57 -0400
commit4b0d898ffdf7c186c6e02b59bb9093488a8774c7 (patch)
tree41a2062bf103703bf009a3d87da80eeab4a9e29c
parent8f7d03e4a1e87c5b32c413f50e362280d8e6928a (diff)
downloadmeta-ti-4b0d898ffdf7c186c6e02b59bb9093488a8774c7.tar.gz
setup-defconfig: allow using KERNEL_LOCALVERSION
* Add capability to use KERNEL_LOCALVERSION to set an extra version string in the kernel. This mimics functionality submitted to the kernel.bbclass but since this overwrites the do_configure it must be added here as well. Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--recipes-kernel/linux/setup-defconfig.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/recipes-kernel/linux/setup-defconfig.inc b/recipes-kernel/linux/setup-defconfig.inc
index fc5e18ed..ed3bce2b 100644
--- a/recipes-kernel/linux/setup-defconfig.inc
+++ b/recipes-kernel/linux/setup-defconfig.inc
@@ -1,3 +1,7 @@
1# KERNEL_LOCALVERSION can be set to add a tag to the end of the
2# kernel version string. such as the commit id
3KERNEL_LOCALVERSION ?= ""
4
1# Check the defconfig file and see if it points to an in kernel 5# Check the defconfig file and see if it points to an in kernel
2# defconfig that should be used, or if it is a complete config file 6# defconfig that should be used, or if it is a complete config file
3 7
@@ -16,6 +20,8 @@ do_setup_defconfig() {
16# 3. else run yes '' | oe_runmake oldconfig like the default do_configure 20# 3. else run yes '' | oe_runmake oldconfig like the default do_configure
17# does 21# does
18do_configure() { 22do_configure() {
23 echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion
24 echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion
19 config=`cat ${S}/.config | grep use-kernel-config | cut -d= -f2` 25 config=`cat ${S}/.config | grep use-kernel-config | cut -d= -f2`
20 if [ "x${config}" != "x" ] 26 if [ "x${config}" != "x" ]
21 then 27 then