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>

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 c067999ff60f0a3747301411ec44cfcc351e96b9..5a831ece66a65442ef523115bde4c3e70d378dcc 100644 (file)
--- 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 0c9c143efd51a5a6e8bb7ddbc0b9b88d457281f3..bb48044d40b2baed34f48ce9a438a0e6b5746da2 100644 (file)
--- 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 371773ff6cb9739afe2af95ecf6e23582ab86f34..9e10ea52e1899bbc4a00e0dcd6893181e14681e0 100644 (file)
--- 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 f50c1444ea9fa1f92665602fc1d1e039e7719605..06f6d2f7ac39cdbd80e951bfa8c502b4a6266917 100644 (file)
--- 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"