summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-09-01 11:20:31 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2014-09-01 12:18:36 -0300
commite9dfb8ace818a173806f9bf6256b0ae22ad42057 (patch)
treedb229d35bdc77ea1eea4d72bb69108506094eb73 /recipes-kernel
parentf1f4115f32562f6fe6c34bbbad5d367b1a2da65f (diff)
downloadmeta-fsl-arm-e9dfb8ace818a173806f9bf6256b0ae22ad42057.tar.gz
linux-imx.inc: Use the new fsl-kernel-localversion class
This uses the new class for LOCALVERSION handling, dropping the old code. The local version is set for '+imx' by default but can be overriden by users of this .inc file. Change-Id: Ib571e17c250473b923b31837954942ca5bacb61b Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-imx.inc28
1 files changed, 1 insertions, 27 deletions
diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc
index 47566b0..dd4540e 100644
--- a/recipes-kernel/linux/linux-imx.inc
+++ b/recipes-kernel/linux/linux-imx.inc
@@ -4,7 +4,7 @@
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" 5LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
6 6
7inherit kernel 7inherit kernel fsl-kernel-localversion
8 8
9# Put a local version until we have a true SRCREV to point to 9# Put a local version until we have a true SRCREV to point to
10LOCALVERSION ?= "+yocto" 10LOCALVERSION ?= "+yocto"
@@ -19,29 +19,3 @@ S = "${WORKDIR}/git"
19# We need to pass it as param since kernel might support more then one 19# We need to pass it as param since kernel might support more then one
20# machine, with different entry points 20# machine, with different entry points
21KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" 21KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
22
23kernel_conf_variable() {
24 CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
25 if test "$2" = "n"
26 then
27 echo "# CONFIG_$1 is not set" >> ${S}/.config
28 else
29 echo "CONFIG_$1=$2" >> ${S}/.config
30 fi
31}
32
33do_configure_prepend() {
34 echo "" > ${S}/.config
35 CONF_SED_SCRIPT=""
36
37 kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\""
38 kernel_conf_variable LOCALVERSION_AUTO y
39
40 sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${S}/.config'
41
42 if [ "${SCMVERSION}" = "y" ]; then
43 # Add GIT revision to the local version
44 head=`git rev-parse --verify --short HEAD 2> /dev/null`
45 printf "%s%s" +g $head > ${S}/.scmversion
46 fi
47}