arm/optee: update to v3.17
PATCH 1/1 arm/optee: update to v3.17
Update the recipes to v3.17 and remove v3.16
Signed-off-by Jon Mason <[email protected]>
---
meta-arm/conf/machine/qemuarm-secureboot.conf | 3 +++
.../optee/optee-client_3.16.0.bb | 3 ---
.../optee/optee-client_3.17.0.bb | 3 +++
...les_3.16.0.bb => optee-examples_3.17.0.bb} | 0
..._3.16.0.bb => optee-os-tadevkit_3.17.0.bb} | 3 ++-
...{optee-os_3.16.0.bb => optee-os_3.17.0.bb} | 5 ++--
.../optee/optee-test/musl-workaround.patch | 24 +++++++++++++++++++
.../optee/optee-test_3.16.0.bb | 3 ---
.../optee/optee-test_3.17.0.bb | 7 ++++++
9 files changed, 42 insertions(+), 9 deletions(-)
delete mode 100644 meta-arm/recipes-security/optee/optee-client_3.16.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-client_3.17.0.bb
rename meta-arm/recipes-security/optee/{optee-examples_3.16.0.bb => optee-examples_3.17.0.bb} (100%)
rename meta-arm/recipes-security/optee/{optee-os-tadevkit_3.16.0.bb => optee-os-tadevkit_3.17.0.bb} (87%)
rename meta-arm/recipes-security/optee/{optee-os_3.16.0.bb => optee-os_3.17.0.bb} (66%)
create mode 100644 meta-arm/recipes-security/optee/optee-test/musl-workaround.patch
delete mode 100644 meta-arm/recipes-security/optee/optee-test_3.16.0.bb
create mode 100644 meta-arm/recipes-security/optee/optee-test_3.17.0.bbmeta-arm/conf/machine/qemuarm-secureboot.conf +3 -0
@@ -20,3 +20,6 @@ WKS_FILE_DEPENDS = "trusted-firmware-a" IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}" MACHINE_FEATURES += "optee-ftpm" + +# FIXME - CPUs 2-4 don't start in the newer OPTEE +PREFERRED_VERSION_optee-os ?= "3.14%"
meta-arm/recipes-security/optee/optee-client_3.16.0.bb deleted +0 -3
@@ -1,3 +0,0 @@ -require optee-client.inc - -SRCREV = "06db73b3f3fdb8d23eceaedbc46c49c0b45fd1e2"
meta-arm/recipes-security/optee/optee-client_3.17.0.bb new file +3 -0
@@ -0,0 +1,3 @@ +require optee-client.inc + +SRCREV = "9a337049c52495e5e16b4a94decaa3e58fce793e"
meta-arm/recipes-security/optee/optee-examples_3.17.0.bb renamed from meta-arm/recipes-security/optee/optee-examples_3.16.0.bb +0 -0
meta-arm/recipes-security/optee/optee-os-tadevkit_3.17.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb +2 -1
@@ -1,10 +1,11 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:" -require optee-os_3.16.0.bb +require optee-os_3.17.0.bb SUMMARY = "OP-TEE Trusted OS TA devkit" DESCRIPTION = "OP-TEE TA devkit for build TAs" HOMEPAGE = "https://www.op-tee.org/" +DEPENDS += "python3-pycryptodome-native" do_install() { #install TA devkit
meta-arm/recipes-security/optee/optee-os_3.17.0.bb renamed from meta-arm/recipes-security/optee/optee-os_3.16.0.bb +3 -2
@@ -1,8 +1,9 @@ require optee-os.inc -SRCREV = "d0b742d1564834dac903f906168d7357063d5459" +SRCREV = "f9e550142dd4b33ee1112f5dd64ffa94ba79cefa" SRC_URI:append = " \ file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ file://0007-allow-setting-sysroot-for-clang.patch \ -" + " +DEPENDS += "dtc-native"
meta-arm/recipes-security/optee/optee-test/musl-workaround.patch new file +24 -0
@@ -0,0 +1,24 @@ +Hack to work around musl compile error: + In file included from optee-test/3.17.0-r0/recipe-sysroot/usr/include/sys/stat.h:23, + from optee-test/3.17.0-r0/git/host/xtest/regression_1000.c:25: + optee-test/3.17.0-r0/recipe-sysroot/usr/include/bits/stat.h:17:26: error: expected identifier or '(' before '[' token + 17 | unsigned __unused[2]; + | ^ + +stat.h is not needed, since it is not being used in this file. So removing it. + +Upstream-Status: Pending [Not submitted to upstream yet] +Signed-off-by: Jon Mason <[email protected]> + +diff --git a/host/xtest/regression_1000.c b/host/xtest/regression_1000.c +index 4264884..7f1baca 100644 +--- a/host/xtest/regression_1000.c ++++ b/host/xtest/regression_1000.c +@@ -22,7 +22,6 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <sys/stat.h> + #include <sys/types.h> + #include <ta_arm_bti.h> + #include <ta_concurrent.h>
meta-arm/recipes-security/optee/optee-test_3.16.0.bb deleted +0 -3
@@ -1,3 +0,0 @@ -require optee-test.inc - -SRCREV = "1cf0e6d2bdd1145370033d4e182634458528579d"
meta-arm/recipes-security/optee/optee-test_3.17.0.bb new file +7 -0
@@ -0,0 +1,7 @@ +require optee-test.inc + +SRC_URI:append = " \ + file://musl-workaround.patch \ + " + +SRCREV = "44a31d02379bd8e50762caa5e1592ad81e3339af"
Signature · 1 line
2.17.1
Jon Mason
AppliedQuoted 1 line · Jon Mason
Update the recipes to v3.17 and remove v3.16
Applied, thanks!
[1/1] arm/optee: update to v3.17
commit: 36b43bc327a30a6eb734117b2994f437ae2f2b77
Best regards,
Signature · 1 line
Jon Mason <[email protected]>