similarity index 71%
rename from meta-arm/recipes-security/optee/optee-client_4.2.0.bb
rename to meta-arm/recipes-security/optee/optee-client_4.3.0.bb
@@ -1,6 +1,6 @@
require recipes-security/optee/optee-client.inc
-SRCREV = "3eac340a781c00ccd61b151b0e9c22a8c6e9f9f0"
+SRCREV = "a5b1ffcd26e328af0bbf18ab448a38ecd558e05c"
inherit pkgconfig
DEPENDS += "util-linux"
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-examples_4.2.0.bb
rename to meta-arm/recipes-security/optee/optee-examples_4.3.0.bb
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-os-tadevkit_4.2.0.bb
rename to meta-arm/recipes-security/optee/optee-os-tadevkit_4.3.0.bb
deleted file mode 100644
@@ -1,45 +0,0 @@
-From c8a2a6529dc3ff609281ef4fe5c5bc949c805b5c Mon Sep 17 00:00:00 2001
-From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
-Date: Thu, 6 Jun 2024 11:42:46 +0200
-Subject: [PATCH] checkconf.mk: do not use full path to generate guard symbol
- in conf.h
-
-The combination of building with -g3 (which emits definitions of all
-defined preprocessor macros to the debug info) and using a full path
-to define the name of this preprocessor guard means that the output is
-not binary reproducible across different build hosts. For example, in
-my Yocto build, the string
-
- __home_ravi_yocto_tmp_glibc_work_stm32mp135fdk_oe_linux_gnueabi_optee_os_stm32mp_3_19_0_stm32mp_r1_1_build_stm32mp135f_dk_include_generated_conf_h_
-
-appears in several build artifacts. Another developer or buildbot
-would not build in some /home/ravi/... directory.
-
-In order to increase binary reproducibility, only use the path sans
-the $(out-dir)/ prefix of the conf.h file.
-
-Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
-Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
----
- mk/checkconf.mk | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Upstream-Status: Backport [c8a2a6529dc3ff609281ef4fe5c5bc949c805b5c]
-
-diff --git a/mk/checkconf.mk b/mk/checkconf.mk
-index 449b1c2b8..bb08d6b15 100644
---- a/mk/checkconf.mk
-+++ b/mk/checkconf.mk
-@@ -17,7 +17,8 @@ define check-conf-h
- cnf='$(strip $(foreach var, \
- $(call cfg-vars-by-prefix,$1), \
- $(call cfg-make-define,$(var))))'; \
-- guard="_`echo $@ | tr -- -/.+ _`_"; \
-+ guardpath="$(patsubst $(out-dir)/%,%,$@)" \
-+ guard="_`echo "$${guardpath}" | tr -- -/.+ _`_"; \
- mkdir -p $(dir $@); \
- echo "#ifndef $${guard}" >$@.tmp; \
- echo "#define $${guard}" >>$@.tmp; \
-2.34.1
-
similarity index 77%
rename from meta-arm/recipes-security/optee/optee-os_4.2.0.bb
rename to meta-arm/recipes-security/optee/optee-os_4.3.0.bb
@@ -4,10 +4,9 @@ DEPENDS += "dtc-native"
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRCREV = "12d7c4ee4642d2d761e39fbcf21a06fb77141dea"
+SRCREV = "1c0d52ace3c237ca6276cafb5c73f699a75c1d40"
SRC_URI += " \
file://0003-optee-enable-clang-support.patch \
- file://0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch \
file://0001-mk-compile.mk-remove-absolute-build-time-paths.patch \
file://0001-compile.mk-use-CFLAGS-from-environment.patch \
file://0002-link.mk-use-CFLAGS-with-version.o.patch \
deleted file mode 100644
@@ -1,34 +0,0 @@
-From 236ebb968a298fa5d461e734559ad8a13b667eb6 Mon Sep 17 00:00:00 2001
-From: Jon Mason <jon.mason@arm.com>
-Date: Wed, 24 Jan 2024 11:35:50 -0500
-Subject: [PATCH] xtest: stats: remove unneeded stat.h include
-
-Hack to work around musl compile error:
-
-| In file included from optee-test/4.1.0/recipe-sysroot/usr/include/sys/stat.h:23,
-| from optee-test/4.1.0/git/host/xtest/stats.c:17:
-| optee-test/4.1.0/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: Inappropriate [https://github.com/OP-TEE/optee_test/issues/722]
-Signed-off-by: Jon Mason <jon.mason@arm.com>
----
- host/xtest/stats.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/host/xtest/stats.c b/host/xtest/stats.c
-index fb16d55586da..05aa3adac611 100644
---- a/host/xtest/stats.c
-+++ b/host/xtest/stats.c
-@@ -14,7 +14,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/stat.h>
- #include <sys/types.h>
- #include <tee_client_api.h>
- #include <unistd.h>
similarity index 78%
rename from meta-arm/recipes-security/optee/optee-test_4.2.0.bb
rename to meta-arm/recipes-security/optee/optee-test_4.3.0.bb
@@ -1,7 +1,7 @@
require recipes-security/optee/optee-test.inc
-SRCREV = "526d5bac1b65f907f67c05cd07beca72fbab88dd"
-SRC_URI += "file://0001-xtest-stats-remove-unneeded-stat.h-include.patch"
+SRCREV = "9d4c4fb9638fb533211037016b6da12fbbcc4bb6"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560"
# Include ffa_spmc test group if the SPMC test is enabled.
# Supported after op-tee v3.20