diff options
author | Daiane Angolini <daiane.angolini@freescale.com> | 2014-11-20 17:17:57 -0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-11-24 18:38:55 -0200 |
commit | 21df40d9fae3be09f15de488790cc30eb4e08236 (patch) | |
tree | 506d18421df947f3b80a9226802143c35aea1355 /recipes-bsp | |
parent | 3bdd3bd04214e0941b31231e02a8636a6aba101e (diff) | |
download | meta-fsl-arm-21df40d9fae3be09f15de488790cc30eb4e08236.tar.gz |
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>
Diffstat (limited to 'recipes-bsp')
-rw-r--r-- | recipes-bsp/u-boot/u-boot-imx_2009.08.bb | 2 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-imx_2013.04.bb | 2 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-ls1.inc | 2 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-ls1_2013.10.bb | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/recipes-bsp/u-boot/u-boot-imx_2009.08.bb b/recipes-bsp/u-boot/u-boot-imx_2009.08.bb index c067999..5a831ec 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2009.08.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2009.08.bb | |||
@@ -56,7 +56,7 @@ EXTRA_OEMAKE += 'HOSTSTRIP=true' | |||
56 | 56 | ||
57 | inherit fsl-u-boot-localversion | 57 | inherit fsl-u-boot-localversion |
58 | 58 | ||
59 | LOCALVERSION = "+imx" | 59 | LOCALVERSION ?= "-${SRCBRANCH}" |
60 | 60 | ||
61 | do_compile_prepend() { | 61 | do_compile_prepend() { |
62 | if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then | 62 | if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then |
diff --git a/recipes-bsp/u-boot/u-boot-imx_2013.04.bb b/recipes-bsp/u-boot/u-boot-imx_2013.04.bb index 28574f8..676fc5b 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2013.04.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2013.04.bb | |||
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git" | |||
16 | 16 | ||
17 | inherit fsl-u-boot-localversion | 17 | inherit fsl-u-boot-localversion |
18 | 18 | ||
19 | LOCALVERSION = "+imx" | 19 | LOCALVERSION ?= "-${SRCBRANCH}" |
20 | 20 | ||
21 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 21 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
22 | COMPATIBLE_MACHINE = "(mx6)" | 22 | COMPATIBLE_MACHINE = "(mx6)" |
diff --git a/recipes-bsp/u-boot/u-boot-ls1.inc b/recipes-bsp/u-boot/u-boot-ls1.inc index 371773f..9e10ea5 100644 --- a/recipes-bsp/u-boot/u-boot-ls1.inc +++ b/recipes-bsp/u-boot/u-boot-ls1.inc | |||
@@ -12,4 +12,6 @@ SRCBRANCH = "LS1-dev" | |||
12 | SRC_URI = "git://git.freescale.com/layerscape/ls1021a/u-boot.git;branch=${SRCBRANCH}" | 12 | SRC_URI = "git://git.freescale.com/layerscape/ls1021a/u-boot.git;branch=${SRCBRANCH}" |
13 | SRCREV = "50d684801cd05ed6b77d52d1ca9ed00fefeac469" | 13 | SRCREV = "50d684801cd05ed6b77d52d1ca9ed00fefeac469" |
14 | 14 | ||
15 | LOCALVERSION ?= "-${SRCBRANCH}" | ||
16 | |||
15 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
diff --git a/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb b/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb index f50c144..06f6d2f 100644 --- a/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb +++ b/recipes-bsp/u-boot/u-boot-ls1_2013.10.bb | |||
@@ -2,7 +2,7 @@ require recipes-bsp/u-boot/u-boot.inc | |||
2 | require u-boot-ls1.inc | 2 | require u-boot-ls1.inc |
3 | inherit fsl-u-boot-localversion | 3 | inherit fsl-u-boot-localversion |
4 | 4 | ||
5 | LOCALVERSION ?= "+ls1" | 5 | LOCALVERSION ?= "-SDK-V1.3" |
6 | 6 | ||
7 | DEPENDS += "u-boot-ls1-tools-native" | 7 | DEPENDS += "u-boot-ls1-tools-native" |
8 | PROVIDES += "u-boot" | 8 | PROVIDES += "u-boot" |