From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH] stm32mp15x: Update to OP-TEE 3.11.0 and tune version output
Date: Thu, 26 Nov 2020 20:08:19 +0100 [thread overview]
Message-ID: <2a104134-cc96-45fe-fc1c-e9f686ccab49@siemens.com> (raw)
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
next reply other threads:[~2020-11-26 19:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 19:08 Jan Kiszka [this message]
2020-12-02 10:17 ` Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2a104134-cc96-45fe-fc1c-e9f686ccab49@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox