From 6026db4e9ea280b42e314a394a2a3b35660d132e Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 4 Nov 2015 03:42:05 +0100 Subject: apalis/colibri_imx6/t20/t30: add version/git hash to Kernel Add LOCALVERSION and generate a scmversion file to annotate the Kernel with the Toradex release and a git hash. --- recipes-kernel/linux/linux-toradex-fsl_git.bb | 11 ++++++++++- recipes-kernel/linux/linux-toradex_git.bb | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/linux-toradex-fsl_git.bb b/recipes-kernel/linux/linux-toradex-fsl_git.bb index cccedd7..ca07f8d 100644 --- a/recipes-kernel/linux/linux-toradex-fsl_git.bb +++ b/recipes-kernel/linux/linux-toradex-fsl_git.bb @@ -11,6 +11,7 @@ DEPENDS += "lzop-native " LINUX_VERSION_mx6 = "3.14.28" +LOCALVERSION = "-${PR}" SRCREV_mx6 = "77e525493f74f9f2e33a41e9e65b54e810ac3dd0" PR_mx6 = "V2.5b2" @@ -43,7 +44,15 @@ do_configure_prepend () { oe_runmake $DEFCONFIG #maybe change some configuration - config_script + config_script + + #Add Toradex BSP Version as LOCALVERSION + sed -i -e /CONFIG_LOCALVERSION/d ${B}/.config + echo "CONFIG_LOCALVERSION=\"${LOCALVERSION}\"" >> ${B}/.config + + #Add GIT revision to the local version + head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` + printf "%s%s" +g $head > ${S}/.scmversion } # We need to pass it as param since kernel might support more then one diff --git a/recipes-kernel/linux/linux-toradex_git.bb b/recipes-kernel/linux/linux-toradex_git.bb index 7b9051f..b7013c9 100644 --- a/recipes-kernel/linux/linux-toradex_git.bb +++ b/recipes-kernel/linux/linux-toradex_git.bb @@ -3,6 +3,7 @@ require recipes-kernel/linux/linux-toradex.inc LINUX_VERSION ?= "3.1.10" +LOCALVERSION = "-${PR}" SRCREV_apalis-t30 = "a2d16785572f10d08693b3cb6d45555909fc7b83" PR_apalis-t30 = "V2.5b2" SRCREV_colibri-pxa = "a2d16785572f10d08693b3cb6d45555909fc7b83" @@ -38,7 +39,15 @@ do_configure_prepend () { oe_runmake $DEFCONFIG #maybe change some configuration - config_script + config_script + + #Add Toradex BSP Version as LOCALVERSION + sed -i -e /CONFIG_LOCALVERSION/d ${B}/.config + echo "CONFIG_LOCALVERSION=\"${LOCALVERSION}\"" >> ${B}/.config + + #Add GIT revision to the local version + head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` + printf "%s%s" +g $head > ${S}/.scmversion } kernel_do_compile() { -- cgit v1.2.3