From 3f17dd091e560ba4334afd5ab3d9fbaa1a7bb664 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 25 Mar 2014 15:42:12 +0100
Subject: [PATCH] meta-digi-arm: fix u-boot version string

Building u-boot with Yocto does not show the version string in the
u-boot header. This is due to how Yocto compiles u-boot. It creates a
.scmversion file which may contain LOCALVERSION strings but in our case
it's empty. Later at build time u-boot's setlocalversion script detects
that file exists and exits with no further action (because it assumes
the file contains the version string).

https://jira.digi.com/browse/DEL-1007

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb | 4 ++++
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb | 4 ++++
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb
index dad1e4890..43e4101c9 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2009.08.bb
@@ -20,5 +20,9 @@ DEPENDS_mxs += "elftosb-native imx-bootlets-dey"
 EXTRA_OEMAKE += 'HOSTSTRIP=true'
 EXTRA_OEMAKE_append_mxs = ' BOOTLETS_DIR=${STAGING_DIR_TARGET}/boot'
 
+do_compile_prepend() {
+	${S}/tools/setlocalversion --save-scmversion ${S}
+}
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mxs|mx5)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb
index bcd47f2f4..dcdceb350 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.01.bb
@@ -15,5 +15,9 @@ S = "${WORKDIR}/git"
 
 DEPENDS_mxs += "elftosb-native"
 
+do_compile_prepend() {
+	${S}/tools/setlocalversion --save-scmversion ${S}
+}
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mxs)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb
index e22736c4c..e0e595545 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb
@@ -11,5 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
 S = "${WORKDIR}/git"
 
+do_compile_prepend() {
+	${S}/tools/setlocalversion --save-scmversion ${S}
+}
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mx6)"