diff mbox series

[[Scarthgap/Master] ] optee: Update to upstream 4.2.0

Message ID 20240521-sg-optee-4-2-update-v1-1-5433865276a2@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series [[Scarthgap/Master] ] optee: Update to upstream 4.2.0 | expand

Commit Message

Kamlesh Gurudasani May 22, 2024, 6:43 a.m. UTC
Update all of the optee components to the upstream 4.2.0 version.

Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com>
---
 meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc   | 4 ++--
 meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc | 2 +-
 meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc       | 4 ++--
 meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc     | 5 ++---
 4 files changed, 7 insertions(+), 8 deletions(-)


---
base-commit: de73fc7fe4e81196d4e4ee9054bb805c967bb73e
change-id: 20240521-sg-optee-4-2-update-185fd5dc31d0

Best regards,

Comments

Chirag Shilwant May 22, 2024, 8:02 a.m. UTC | #1
Hi Kamlesh,

On 22/05/24 12:13, Kamlesh Gurudasani wrote:
> Update all of the optee components to the upstream 4.2.0 version.
>
> Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com>
> ---
>   meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc   | 4 ++--
>   meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc | 2 +-
>   meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc       | 4 ++--
>   meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc     | 5 ++---
>   4 files changed, 7 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 16fbd6c5..31d59be8 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.1.0+git"
> -SRCREV = "f7e4ced15d1fefd073bbfc484fe0e1f74afe96c2"
> +PV = "4.2.0+git${SRCPV}"


A change in oe-core has dropped setting SRCPV [1]
Since it's now empty, we shouldn't use it when setting PV.

[1]: 
https://git.openembedded.org/openembedded-core/commit/?id=a8e7b0f932b9ea69b3a218fca18041676c65aba0


> +SRCREV = "3eac340a781c00ccd61b151b0e9c22a8c6e9f9f0"
> 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 23cd7580..03e93c3c 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.0.0+git"
> +PV = "4.2.0+git${SRCPV}"
>   SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
> 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 9db67567..bfafff3c 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.1.0+git"
> -SRCREV = "012cdca49db398693903e05c42a254a3a0c0d8f2"
> +PV = "4.2.0+git${SRCPV}"


Same comment as above


> +SRCREV = "12d7c4ee4642d2d761e39fbcf21a06fb77141dea"
>   
>   # Fixes for pointing to 4.0.0 before upstream meta-arm
>   FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-4.0.0:"
> 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 16b2dfc3..a7d048f6 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,6 +1,5 @@
> -PV = "4.1.0+git"
> -SRCREV = "2e1e7a9c9d659585566a75fc8802f4758c42bcb2"
> +PV = "4.2.0+git${SRCPV}"



Same comment as above


> +SRCREV = "526d5bac1b65f907f67c05cd07beca72fbab88dd"
>   
>   # Fixes for pointing to 4.0.0 before upstream meta-arm
>   SRC_URI:remove = "file://0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch"
> -
>
> ---
> base-commit: de73fc7fe4e81196d4e4ee9054bb805c967bb73e
> change-id: 20240521-sg-optee-4-2-update-185fd5dc31d0
>
> Best regards,
Chirag Shilwant May 22, 2024, 8:12 a.m. UTC | #2
A nitpick which should be handled in v2,

Format for Subject : [meta-ti][list of branches][PATCH]

Eg: [meta-ti][master/scarthgap][PATCH v2] in your case

On 22/05/24 13:32, Chirag Shilwant via lists.yoctoproject.org wrote:
> Hi Kamlesh, On 22/05/24 12: 13, Kamlesh Gurudasani wrote: > Update all 
> of the optee components to the upstream 4. 2. 0 version. > > 
> Signed-off-by: Kamlesh Gurudasani <kamlesh@ ti. com> > --- > 
> meta-ti-bsp/recipes-security/optee/optee-client-ti-version. inc
> ZjQcmQRYFpfptBannerStart
> This message was sent from outside of Texas Instruments.
> Do not click links or open attachments unless you recognize the source 
> of this email and know the content is safe. If you wish to report this 
> message to IT Security, please forward the message as an attachment to 
> phishing@list.ti.com
> ZjQcmQRYFpfptBannerEnd
> Hi Kamlesh,
>
> On 22/05/24 12:13, Kamlesh Gurudasani wrote:
> > Update all of the optee components to the upstream 4.2.0 version.
> >
> > Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com>
> > ---
> >   meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc   | 4 ++--
> >   meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc | 2 +-
> >   meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc       | 4 ++--
> >   meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc     | 5 ++---
> >   4 files changed, 7 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 16fbd6c5..31d59be8 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.1.0+git"
> > -SRCREV = "f7e4ced15d1fefd073bbfc484fe0e1f74afe96c2"
> > +PV = "4.2.0+git${SRCPV}"
>
>
> A change in oe-core has dropped setting SRCPV [1]
> Since it's now empty, we shouldn't use it when setting PV.
>
> [1]:
> https://urldefense.com/v3/__https://git.openembedded.org/openembedded-core/commit/?id=a8e7b0f932b9ea69b3a218fca18041676c65aba0__;!!G3vK!RkRM24E_A5xZzfiwR9tF5u3KG5JYaRDzKOeP3YZ8VgmBN3m0GDKgqb_uNOGJ8DBW6WRHX4Pdy7pOZ_ht52OFre1iLRI-yH_GGw0N$
>
>
> > +SRCREV = "3eac340a781c00ccd61b151b0e9c22a8c6e9f9f0"
> > 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 23cd7580..03e93c3c 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.0.0+git"
> > +PV = "4.2.0+git${SRCPV}"
> >   SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
> > 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 9db67567..bfafff3c 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.1.0+git"
> > -SRCREV = "012cdca49db398693903e05c42a254a3a0c0d8f2"
> > +PV = "4.2.0+git${SRCPV}"
>
>
> Same comment as above
>
>
> > +SRCREV = "12d7c4ee4642d2d761e39fbcf21a06fb77141dea"
> >   
> >   # Fixes for pointing to 4.0.0 before upstream meta-arm
> >   FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-4.0.0:"
> > 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 16b2dfc3..a7d048f6 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,6 +1,5 @@
> > -PV = "4.1.0+git"
> > -SRCREV = "2e1e7a9c9d659585566a75fc8802f4758c42bcb2"
> > +PV = "4.2.0+git${SRCPV}"
>
>
>
> Same comment as above
>
>
> > +SRCREV = "526d5bac1b65f907f67c05cd07beca72fbab88dd"
> >   
> >   # Fixes for pointing to 4.0.0 before upstream meta-arm
> >   SRC_URI:remove = "file://0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch"
> > -
> >
> > ---
> > base-commit: de73fc7fe4e81196d4e4ee9054bb805c967bb73e
> > change-id: 20240521-sg-optee-4-2-update-185fd5dc31d0
> >
> > Best regards,
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#17666): https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/message/17666__;!!G3vK!RkRM24E_A5xZzfiwR9tF5u3KG5JYaRDzKOeP3YZ8VgmBN3m0GDKgqb_uNOGJ8DBW6WRHX4Pdy7pOZ_ht52OFre1iLRI-yG2YA6dH$
> Mute This Topic: https://urldefense.com/v3/__https://lists.yoctoproject.org/mt/106238606/7030289__;!!G3vK!RkRM24E_A5xZzfiwR9tF5u3KG5JYaRDzKOeP3YZ8VgmBN3m0GDKgqb_uNOGJ8DBW6WRHX4Pdy7pOZ_ht52OFre1iLRI-yLoEuoVe$
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://urldefense.com/v3/__https://lists.yoctoproject.org/g/meta-ti/unsub__;!!G3vK!RkRM24E_A5xZzfiwR9tF5u3KG5JYaRDzKOeP3YZ8VgmBN3m0GDKgqb_uNOGJ8DBW6WRHX4Pdy7pOZ_ht52OFre1iLRI-yF1XVyPv$  [c-shilwant@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

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 16fbd6c5..31d59be8 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.1.0+git"
-SRCREV = "f7e4ced15d1fefd073bbfc484fe0e1f74afe96c2"
+PV = "4.2.0+git${SRCPV}"
+SRCREV = "3eac340a781c00ccd61b151b0e9c22a8c6e9f9f0"
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 23cd7580..03e93c3c 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.0.0+git"
+PV = "4.2.0+git${SRCPV}"
 SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
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 9db67567..bfafff3c 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.1.0+git"
-SRCREV = "012cdca49db398693903e05c42a254a3a0c0d8f2"
+PV = "4.2.0+git${SRCPV}"
+SRCREV = "12d7c4ee4642d2d761e39fbcf21a06fb77141dea"
 
 # Fixes for pointing to 4.0.0 before upstream meta-arm
 FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-4.0.0:"
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 16b2dfc3..a7d048f6 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,6 +1,5 @@ 
-PV = "4.1.0+git"
-SRCREV = "2e1e7a9c9d659585566a75fc8802f4758c42bcb2"
+PV = "4.2.0+git${SRCPV}"
+SRCREV = "526d5bac1b65f907f67c05cd07beca72fbab88dd"
 
 # Fixes for pointing to 4.0.0 before upstream meta-arm
 SRC_URI:remove = "file://0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch"
-