linux-*: Rework LOCALVERSION depending on SRCBRANCH

PATCH New Daiane Angolini 1 participant 1 message Nov 20, 2014

lore

Share & tools

lore

Daiane Angolini

author

2014-11-20 19:19 UTC #0 lore raw

PATCH 1/1 linux-*: Rework LOCALVERSION depending on SRCBRANCH

From: Daiane Angolini <[email protected]>

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 <[email protected]>

---
 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(-)

recipes-kernel/linux/linux-cubox-i_3.14.14.bb +1 -1

index 8c1e926..dc93084 100644
@@ -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"

recipes-kernel/linux/linux-denx.inc +1 -1

index ec331ac..d8ba4a1 100644
@@ -19,4 +19,4 @@ SRCBRANCH ?= "master"
 SRC_URI = "git://git.denx.de/linux-denx.git;branch=${SRCBRANCH} \
            file://defconfig"
 
-LOCALVERSION = "-denx"
+LOCALVERSION = "-master"

recipes-kernel/linux/linux-wandboard.inc +1 -1

index 792e991..8809a17 100644
@@ -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

Signature · 1 line

1.9.1