* [meta-ti] meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag
@ 2025-09-11 10:57 Suhaas Joshi
2025-09-11 12:20 ` PRC Automation
2025-09-11 12:28 ` Ryan Eatmon
0 siblings, 2 replies; 3+ messages in thread
From: Suhaas Joshi @ 2025-09-11 10:57 UTC (permalink / raw)
To: meta-ti; +Cc: s-joshi, kamlesh
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 <s-joshi@ti.com>
---
.../recipes-security/optee/optee-client-ti-version.inc | 4 ++--
.../recipes-security/optee/optee-examples-ti-version.inc | 4 ++--
.../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 | 4 ++--
6 files changed, 16 insertions(+), 8 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 86c92863..289ca5b5 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,2 +1,2 @@
-PV = "4.6.0+git"
-SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"
+PV = "4.7.0+git"
+SRCREV = "23c112a6f05cc5e39bd4aaf52ad515cad532237d"
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-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 d9705a0b..7b5b3912 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 = "86846f4fdf14f25b50fd64a87888ca9fe85a9e2b"
SRC_URI:remove = " \
file://0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.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 35e780b3..d2593cb8 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,7 +1,7 @@
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560"
-PV = "4.6.0+git"
-SRCREV = "a9e9495f4d57b97022008ad11198195e7e044c5d"
+PV = "4.7.0+git"
+SRCREV = "a15be9eca1b7e935917d834284726027dffc8cfb"
SRC_URI:remove = " \
file://0001-xtest-stats-remove-unneeded-stat.h-include.patch \
--
2.40.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [meta-ti] meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag
2025-09-11 10:57 [meta-ti] meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag Suhaas Joshi
@ 2025-09-11 12:20 ` PRC Automation
2025-09-11 12:28 ` Ryan Eatmon
1 sibling, 0 replies; 3+ messages in thread
From: PRC Automation @ 2025-09-11 12:20 UTC (permalink / raw)
To: Suhaas Joshi; +Cc: meta-ti, kamlesh
meta-ti / na / 20250911105736.450595-1-s-joshi
PRC Results: FAIL
=========================================================
check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
WARN - [meta-ti] meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag
WARN: Missing branches specifier [master/scarthgap/XXXXX]. (META-2)
patch:42
Subject: [meta-ti] meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag
WARN: Commit message does not include file/recipe name: meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag. (COMMIT-MESSAGE-2)
patch
WARN: Commit message should not include directory path to recipe: meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag.
meta-ti-bsp:
recipes-security: (COMMIT-MESSAGE-3)
patch
=========================================================
apply-yocto-patch: FAIL
=========================================================
master
=====================
Summary:
- Patch Series: [meta-ti] meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag
- Submitter: From: Suhaas Joshi <s-joshi@ti.com>
- Date: Date: Thu, 11 Sep 2025 16:27:36 +0530
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: 4f0d7923bcc70cc9fb6f18cc5fea3dcd77386072
Applied to:
- Repository: lcpd-prc-meta-ti
- Base Branch: master
- Commit Author: LCPD Automation Script <lcpdbld@list.ti.com>
- Commit Subject: CI/CD Auto-Merger: cicd.master.202508271122
- Commit SHA: 3dad773982636ade2ba685089e351ce69a28f9dc
Patches
----------------------------------------
FAIL - [meta-ti] meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag
error: patch failed: meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc:1
error: meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc: patch does not apply
error: patch failed: meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc:1
error: meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc: patch does not apply
error: patch failed: meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc:1
error: meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc: patch does not apply
Applying: meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag
Patch failed at 0001 meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [meta-ti] meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag
2025-09-11 10:57 [meta-ti] meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag Suhaas Joshi
2025-09-11 12:20 ` PRC Automation
@ 2025-09-11 12:28 ` Ryan Eatmon
1 sibling, 0 replies; 3+ messages in thread
From: Ryan Eatmon @ 2025-09-11 12:28 UTC (permalink / raw)
To: s-joshi, meta-ti; +Cc: kamlesh
There need to need to be two versions of this patch series. One for
scarthgap and one for master. Please do the work needed to make this
change for both branches and submit a v2.
There is now an extra optee file (optee-ftpm) that is now being
controlled on the master branch that needs to be updated as well. The
patch is on the master-wip and master-next branches waiting for CICD to
promote them.
Also, please do not include the path down to the recipes in the subject.
This could have been:
optee: Update to 4.7.0 tag
We can look at the patch and see where the files live, we do not need
them in the subject.
On 9/11/2025 5:57 AM, Suhaas Joshi via lists.yoctoproject.org wrote:
> 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 <s-joshi@ti.com>
> ---
> .../recipes-security/optee/optee-client-ti-version.inc | 4 ++--
> .../recipes-security/optee/optee-examples-ti-version.inc | 4 ++--
> .../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 | 4 ++--
> 6 files changed, 16 insertions(+), 8 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 86c92863..289ca5b5 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,2 +1,2 @@
> -PV = "4.6.0+git"
> -SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"
> +PV = "4.7.0+git"
> +SRCREV = "23c112a6f05cc5e39bd4aaf52ad515cad532237d"
> 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-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 d9705a0b..7b5b3912 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 = "86846f4fdf14f25b50fd64a87888ca9fe85a9e2b"
>
> SRC_URI:remove = " \
> file://0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.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 35e780b3..d2593cb8 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,7 +1,7 @@
> LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560"
>
> -PV = "4.6.0+git"
> -SRCREV = "a9e9495f4d57b97022008ad11198195e7e044c5d"
> +PV = "4.7.0+git"
> +SRCREV = "a15be9eca1b7e935917d834284726027dffc8cfb"
>
> SRC_URI:remove = " \
> file://0001-xtest-stats-remove-unneeded-stat.h-include.patch \
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#18992): https://lists.yoctoproject.org/g/meta-ti/message/18992
> Mute This Topic: https://lists.yoctoproject.org/mt/115186606/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-11 12:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-11 10:57 [meta-ti] meta-ti-bsp: recipes-security: optee: Update to 4.7.0 tag Suhaas Joshi
2025-09-11 12:20 ` PRC Automation
2025-09-11 12:28 ` Ryan Eatmon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.