u-boot-*: 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>

4 files changed, 5 insertions, 3 deletions

diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
index c067999ff..5a831ece6 100644
--- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bb
@@ -56,7 +56,7 @@ EXTRA_OEMAKE += 'HOSTSTRIP=true'
 
 inherit fsl-u-boot-localversion
 
-LOCALVERSION = "+imx"
+LOCALVERSION ?= "-${SRCBRANCH}"
 
 do_compile_prepend() {
         if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2014.04.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
index 0c9c143ef..bb48044d4 100644
--- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-imx_2014.04.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git"
 
 inherit fsl-u-boot-localversion
 
-LOCALVERSION = "+imx"
+LOCALVERSION ?= "-${SRCBRANCH}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mx6)"
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1.inc b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1.inc
index 371773ff6..9e10ea52e 100644
--- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1.inc
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1.inc
@@ -12,4 +12,6 @@ SRCBRANCH = "LS1-dev"
 SRC_URI = "git://git.freescale.com/layerscape/ls1021a/u-boot.git;branch=${SRCBRANCH}"
 SRCREV = "50d684801cd05ed6b77d52d1ca9ed00fefeac469"
 
+LOCALVERSION ?= "-${SRCBRANCH}"
+
 S = "${WORKDIR}/git"
diff --git a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb
index f50c1444e..06f6d2f7a 100644
--- a/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb
+++ b/meta-fsl-arm/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb
@@ -2,7 +2,7 @@ require recipes-bsp/u-boot/u-boot.inc
 require u-boot-ls1.inc
 inherit fsl-u-boot-localversion
 
-LOCALVERSION ?= "+ls1"
+LOCALVERSION ?= "-SDK-V1.3"
 
 DEPENDS += "u-boot-ls1-tools-native"
 PROVIDES += "u-boot"