From 4f07328fc394ffb02690f669657be65199a2c628 Mon Sep 17 00:00:00 2001 From: Suhaas Joshi Date: Fri, 12 Sep 2025 17:56:42 +0530 Subject: optee: Update to 4.7.0 tag Update optee_client, optee_examples, optee_os and optee_test to the newer 4.7.0 tag from the previous 4.6.0 one. Further: meta-arm applies 0003-optee-enable-clang-support patch to optee_os. However, in a recent upstream commit [0], the line to which the patch applies was removed. Therefore the patch is no longer required. As a result, tell optee_os.bbappend file to remove it. [0] https://github.com/OP-TEE/optee_os/commit/3d5c2dd8b59ae888434b3f86842828131f115d90 Signed-off-by: Suhaas Joshi Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc | 4 ++-- meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc | 4 ++-- meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc | 4 ++-- meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend | 4 ++++ meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc | 4 ++-- meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 4 ++++ meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc | 5 +++-- 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc index dd00cde1..ec10cefe 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc @@ -1,5 +1,5 @@ -PV = "4.6.0+git" -SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75" +PV = "4.7.0+git" +SRCREV = "23c112a6f05cc5e39bd4aaf52ad515cad532237d" SRC_URI:remove = " \ file://0001-tee-supplicant-add-udev-rule-and-systemd-service-fil.patch \ diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc index 6c120be2..91dd5e60 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc @@ -1,2 +1,2 @@ -PV = "4.6.0+git" -SRCREV = "5306d2c7c618bb4a91df17a2d5d79ae4701af4a3" +PV = "4.7.0+git" +SRCREV = "14321a0607db16099d158478b21a2b2e37b3a935" diff --git a/meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc index 119795c4..55ca0e34 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc @@ -1,2 +1,2 @@ -PV = "4.6.0+git" -SRCREV_optee-ta = "6f99e783eb9bb57c314a881433d4ec970de87959" +PV = "4.7.0+git" +SRCREV_optee-ta = "ce33372ab772e879826361a1ca91126260bd9be1" diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend index 980f7a4b..407436a9 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend @@ -6,4 +6,8 @@ require ${OPTEE_TI_VERSION} OPTEE_TI_OVERRIDES = "" OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" +SRC_URI:remove = " \ + file://0003-optee-enable-clang-support.patch \ +" + require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc index a9a1d1e8..9b1db77b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc @@ -1,5 +1,5 @@ -PV = "4.6.0+git" -SRCREV = "71785645fa6ce42db40dbf5a54e0eaedc4f61591" +PV = "4.7.0+git" +SRCREV = "a9690ae39995af36a31b7a4f446f27ea0787e3a4" SRC_URI:remove = " \ file://0001-mk-compile.mk-remove-absolute-build-time-paths.patch \ diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index 0cee127f..50f87199 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -6,4 +6,8 @@ require ${OPTEE_TI_VERSION} OPTEE_TI_OVERRIDES = "" OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" +SRC_URI:remove = " \ + file://0003-optee-enable-clang-support.patch \ +" + require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc index dec59d88..4a4a2f92 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc @@ -1,5 +1,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/optee-test:" -PV = "4.6.0+git" -SRCREV = "a9e9495f4d57b97022008ad11198195e7e044c5d" +PV = "4.7.0+git" +SRCREV = "a15be9eca1b7e935917d834284726027dffc8cfb" + SRC_URI += "file://0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch" -- cgit v1.2.3-54-g00ecf