[PATCH] stm32mp15x: Update to OP-TEE 3.11.0 and tune version output

[PATCH] stm32mp15x: Update to OP-TEE 3.11.0 and tune version output

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Bump the version and make sure it is visible to the build as we are not
compiling over a git tree with tags.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

This was supposed to be folded into v4 of the original series but 
somehow got lost locally.

 ...stm32mp15x_3.10.0.bb => optee-os-stm32mp15x_3.11.0.bb} | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
 rename meta-isar/recipes-bsp/optee-os/{optee-os-stm32mp15x_3.10.0.bb => optee-os-stm32mp15x_3.11.0.bb} (63%)

diff --git a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.10.0.bb b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb
similarity index 63%
rename from meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.10.0.bb
rename to meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb
index a2570946..0fa2005d 100644
--- a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.10.0.bb
+++ b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb
@@ -6,7 +6,7 @@
 require recipes-bsp/optee-os/optee-os-custom.inc
 
 SRC_URI += "https://github.com/OP-TEE/optee_os/archive/${PV}.tar.gz"
-SRC_URI[sha256sum] = "d30776ab051b701cdd2b71d32ff5cd54285a688440cc90aefd14b4f0f6495d7c"
+SRC_URI[sha256sum] = "3c34eda1052fbb9ed36fcfdfaecfd2685023b9290670c1a5982f8a0457bfd2cb"
 
 S = "${WORKDIR}/optee_os-${PV}"
 
@@ -17,3 +17,9 @@ OPTEE_EXTRA_BUILDARGS = " \
     ARCH=arm CFG_EMBED_DTB_SOURCE_FILE=stm32mp157c-ev1.dts \
     CFG_TEE_CORE_LOG_LEVEL=2"
 OPTEE_BINARIES = "tee-header_v2.stm32 tee-pageable_v2.stm32 tee-pager_v2.stm32"
+
+# Set version manually to PV, the tarball does not contain any hint.
+# Alternative: pull from git and add git as build dependency.
+dpkg_runbuild_prepend() {
+    export TEE_IMPL_VERSION=${PV}
+}
-- 
2.26.2

Re: [PATCH] stm32mp15x: Update to OP-TEE 3.11.0 and tune version output

[Anton Mikanovich]

26.11.2020 22:08, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Bump the version and make sure it is visible to the build as we are not
> compiling over a git tree with tags.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Applied to next, thanks.

-- 
Anton Mikanovich
Promwad Ltd.
External service provider of ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn, Germany
+49 (89) 122 67 24-0
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov