summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-04-05 16:13:49 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-04-10 00:58:01 +0200
commitd351e11b76c004afbf0f37d5481266bafdb015ee (patch)
treea1fad7e95cafc46cbe323e39e699f07450e5b214
parent0eeb269080baf168e12207791d34661e6c2fbf63 (diff)
This results in a U-Boot banner: U-Boot 2016.11-2.7.2+g3e67ed8 (Apr 05 2017 - 16:16:38 +0200) While at it extract the versioning into its own bbappend so that we can upstream the base recipe to meta-freescale-3rdparty Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb1
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex_2016.11.bb2
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend9
3 files changed, 10 insertions, 2 deletions
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
index e167fe5..af1a510 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
@@ -26,6 +26,7 @@ SRC_URI_append_mx6 = " file://fw_unlock_mmc.sh "
PV = "2016.11"
PR = "${TDX_VER_INT}-gitr${@d.getVar("SRCREV", False)[0:7]}"
+LOCALVERSION ?= "-${TDX_VER_INT}"
S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb
index a2347fc..998d176 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bb
@@ -1,8 +1,6 @@
require recipes-bsp/u-boot/u-boot-toradex.inc
-include conf/tdx_version.conf
PV = "2016.11"
-PR = "${TDX_VER_INT}-gitr${@d.getVar("SRCREV", False)[0:7]}"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend
new file mode 100644
index 0000000..5814525
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend
@@ -0,0 +1,9 @@
+include conf/tdx_version.conf
+
+PR = "${TDX_VER_INT}-gitr${@d.getVar("SRCREV", False)[0:7]}"
+LOCALVERSION ?= "-${TDX_VER_INT}"
+
+#LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
+
+#SRCREV = "60021a4daa9720ae89e31def9483a09a78ead049"
+#SRCBRANCH = "2016.11-toradex-next"