Skip to contentSkip to conversation

optee-client: remove patch that got accepted upstream

PATCH In review Denys Dmytriyenko 2 participants 4 messages Apr 8, 2025 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 optee-client: remove patch that got accepted upstream

From: Denys Dmytriyenko <[email protected]>

meta-arm adds a patch that was sent and accepted upstream, remove it since mta-ti pulls a more recent verstion.

---
 .../recipes-security/optee/optee-client-ti-version.inc        | 4 ++++
 1 file changed, 4 insertions(+)
meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc +4 -0
index 2c8977dd..a628e446 100644
@@ -1,2 +1,6 @@
 PV = "4.4.0+git"
 SRCREV = "d221676a58b305bddbf97db00395205b3038de8e"
+
+SRC_URI:remove = " \
+    file://0001-tee-supplicant-add-udev-rule-and-systemd-service-fil.patch \
+"
Signature · 1 line
2.25.1
#1 lore raw

I was unsure about doing this...

meta-arm added a second optee recipe version. So both exist:
optee-client_4.3.0.bb
optee-client_4.4.0.bb

So "theoretically" the build should prefer the newer version, right?

But for some reason, our builds keep loading the 4.3.0 recipe and then our bbappend bumps the version to 4.4.0. The 4.3.0 recipe has this offending patch, but the 4.4.0 version does not.

I've been trying to figure out why our builds keep locking into 4.3.0 when the 4.4.0 is sitting right there...

I agree that this patch is a good work around, but I'm not 100% sure it's the final best fix.

Quoted 32 lines · Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

meta-arm adds a patch that was sent and accepted upstream, remove it since mta-ti pulls a more recent verstion.

---
  .../recipes-security/optee/optee-client-ti-version.inc        | 4 ++++
  1 file changed, 4 insertions(+)
meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc +4 -1
index 2c8977dd..a628e446 100644
@@ -1,2 +1,6 @@
  PV = "4.4.0+git"
  SRCREV = "d221676a58b305bddbf97db00395205b3038de8e"
+
+SRC_URI:remove = " \
+    file://0001-tee-supplicant-add-udev-rule-and-systemd-service-fil.patch \
+"
 
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#18447): https://lists.yoctoproject.org/g/meta-ti/message/18447
Mute This Topic: https://lists.yoctoproject.org/mt/112146993/6551054
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#2 lore raw
Quoted 8 lines · Ryan Eatmon

I was unsure about doing this...

meta-arm added a second optee recipe version. So both exist:
optee-client_4.3.0.bb
optee-client_4.4.0.bb

So "theoretically" the build should prefer the newer version, right?

No, that's not how it works. Our bbappend in version-agnostic and hence gets applied to both base recipes. And then bbappend bumps the PV and they are now matching and neither is newer than the other.

Quoted 6 lines

But for some reason, our builds keep loading the 4.3.0 recipe and then our bbappend bumps the version to 4.4.0. The 4.3.0 recipe has this offending patch, but the 4.4.0 version does not.

I've been trying to figure out why our builds keep locking into 4.3.0 when the 4.4.0 is sitting right there...

It is a downside of version-agnostic bbappends with PV changes - we've been in this situation before. And we used some version-specific tricks to make it work. Another solution is to make bbappend match a specific version, e.g. rename it to optee-client_4.4%.bbappend for a while, until 4.5 is out...

Quoted 2 lines

I agree that this patch is a good work around, but I'm not 100% sure it's the final best fix.

This way is more generic - below :remove would be no-op if such patch is not in the SRC_URI.

Quoted 22 lines · Denys Dmytriyenko
Quoted 21 lines

From: Denys Dmytriyenko <[email protected]>

meta-arm adds a patch that was sent and accepted upstream, remove it since mta-ti pulls a more recent verstion.

---
 .../recipes-security/optee/optee-client-ti-version.inc        | 4 ++++
 1 file changed, 4 insertions(+)
meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc +4 -0
index 2c8977dd..a628e446 100644
@@ -1,2 +1,6 @@
 PV = "4.4.0+git"
 SRCREV = "d221676a58b305bddbf97db00395205b3038de8e"
+
+SRC_URI:remove = " \
+    file://0001-tee-supplicant-add-udev-rule-and-systemd-service-fil.patch \
+"

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw
Quoted 7 lines · Ryan Eatmon via lists.yoctoproject.org

I was unsure about doing this...

meta-arm added a second optee recipe version.  So both exist:
optee-client_4.3.0.bb
optee-client_4.4.0.bb

Quoted 8 lines

So "theoretically" the build should prefer the newer version, right?

But for some reason, our builds keep loading the 4.3.0 recipe and then our bbappend bumps the version to 4.4.0.  The 4.3.0 recipe has this offending patch, but the 4.4.0 version does not.

I've been trying to figure out why our builds keep locking into 4.3.0 when the 4.4.0 is sitting right there...

I agree that this patch is a good work around, but I'm not 100% sure it's the final best fix.

It looks like our setting of PV in our bbappend is what is causing this.
When I comment out that line the correct recipe version from meta-arm
is picked.

But when I change it from "4.4.0+git" to just "4.4.0" it still picks the 4.3.0 version.

It's like setting that make bitbake think that the 4.3.0 recipe is newer (or as new) as the 4.4.0 recipe.

Setting PV = "4.3.9" also does not work. Looks like setting PV to anything in our .inc file causes this bad behavior. Thoughts?

Quoted 41 lines · Denys Dmytriyenko
Quoted 20 lines

From: Denys Dmytriyenko <[email protected]>

meta-arm adds a patch that was sent and accepted upstream, remove it since mta-ti pulls a more recent verstion.

---
  .../recipes-security/optee/optee-client-ti-version.inc        | 4 ++++

  1 file changed, 4 insertions(+)
meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc +0 -0
index 2c8977dd..a628e446 100644
@@ -1,2 +1,6 @@

  PV = "4.4.0+git"
  SRCREV = "d221676a58b305bddbf97db00395205b3038de8e"

meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc +3 -0
+
+SRC_URI:remove = " \
+    
Quoted 7 lines

file://0001-tee-supplicant-add-udev-rule-and-systemd-service-fil.patch \
+"

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#18449): https://lists.yoctoproject.org/g/meta-ti/message/18449
Mute This Topic: https://lists.yoctoproject.org/mt/112146993/6551054
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS