[meta-freescale] [meta-fsl-arm-extra][PATCH] linux-*: Rework LOCALVERSION depending on SRCBRANCH

Daiane Angolini daiane.list at gmail.com
Thu Nov 20 11:18:51 PST 2014


From: Daiane Angolini <daiane.angolini at freescale.com>

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 at freescale.com>
---
 recipes-kernel/linux/linux-cubox-i_3.14.14.bb | 2 +-
 recipes-kernel/linux/linux-denx.inc           | 2 +-
 recipes-kernel/linux/linux-wandboard.inc      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/linux/linux-cubox-i_3.14.14.bb b/recipes-kernel/linux/linux-cubox-i_3.14.14.bb
index 8c1e926..dc93084 100644
--- a/recipes-kernel/linux/linux-cubox-i_3.14.14.bb
+++ b/recipes-kernel/linux/linux-cubox-i_3.14.14.bb
@@ -9,7 +9,7 @@ DEPENDS += "lzop-native bc-native"
 
 SRCBRANCH ?= "linux-linaro-lsk-v3.14-mx6"
 SRCREV = "4a2f77e014b8cdd10af1aac0db40f582be027f51"
-LOCALVERSION = "-cubox-i+yocto"
+LOCALVERSION ?= "-${SRCBRANCH}"
 
 SRC_URI = "git://github.com/SolidRun/linux-imx6-3.14.git;branch=${SRCBRANCH} \
            file://defconfig"
diff --git a/recipes-kernel/linux/linux-denx.inc b/recipes-kernel/linux/linux-denx.inc
index ec331ac..d8ba4a1 100644
--- a/recipes-kernel/linux/linux-denx.inc
+++ b/recipes-kernel/linux/linux-denx.inc
@@ -19,4 +19,4 @@ SRCBRANCH ?= "master"
 SRC_URI = "git://git.denx.de/linux-denx.git;branch=${SRCBRANCH} \
            file://defconfig"
 
-LOCALVERSION = "-denx"
+LOCALVERSION = "-master"
diff --git a/recipes-kernel/linux/linux-wandboard.inc b/recipes-kernel/linux/linux-wandboard.inc
index 792e991..8809a17 100644
--- a/recipes-kernel/linux/linux-wandboard.inc
+++ b/recipes-kernel/linux/linux-wandboard.inc
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 require recipes-kernel/linux/linux-imx.inc
 
 # Put a local version until we have a true SRCREV to point to
-LOCALVERSION ?= "+yocto"
 SCMVERSION ?= "y"
 
 SRCBRANCH ??= "master"
+LOCALVERSION ?= "-${SRCBRANCH}"
 
 # Allow override of WANDBOARD_GITHUB_MIRROR to make use of
 # local repository easier
-- 
1.9.1



More information about the meta-freescale mailing list