linux-*: Rework LOCALVERSION depending on SRCBRANCH

LOCALVERSION is used in FSL Community BSP Release Notes and should highlight
which are the _release version_ for that particular provider.

In addition LOCALVERSION makes it easy to track where the binary running on a
target is from.

Both reasons make LOCALVERSION a very important information.

The overall rule is that LOCALVERSION would point to SRCBRANCH, unless in a case
of explicit exception.

Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-ls1.inc b/meta-fsl-arm/recipes-kernel/linux/linux-ls1.inc
index 19614fdbfd85dd9c6b78a385ecdbe4cff6c51cf6..72be73814bcc1755cff739a88d78f06d9058e9f3 100644 (file)
--- a/meta-fsl-arm/recipes-kernel/linux/linux-ls1.inc
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-ls1.inc
@@ -2,7 +2,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 inherit kernel fsl-kernel-localversion
-LOCALVERSION ?= "+ls1"
+LOCALVERSION ?= "-${SRCBRANCH}"
 
 SRC_URI = "git://git.freescale.com/layerscape/ls1021a/linux.git;branch=${SRCBRANCH} \
     file://defconfig \

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-timesys_3.0.15.bb b/meta-fsl-arm/recipes-kernel/linux/linux-timesys_3.0.15.bb
index 24ea0767d5c4656c0060bee754ceefbe2281d7d3..25fd9e559f7e99bad400a30fa591f0c09929178a 100644 (file)
--- a/meta-fsl-arm/recipes-kernel/linux/linux-timesys_3.0.15.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-timesys_3.0.15.bb
@@ -15,6 +15,6 @@ SRC_URI_append_twr-vf65gs10 = "file://0001-mvf_fec.c-Fix-mac-address-read-to-mat
 
 SRCBRANCH = "3.0.15_vybrid-twr"
 SRCREV = "50c4c848d6b8743894cfcec166db475ef6140504"
-LOCALVERSION = "-3.0-mvf+yocto"
+LOCALVERSION ?= "-${SRCBRANCH}"
 
 COMPATIBLE_MACHINE = "(vf60)"