Hi Ryan,

On 08:29-20231026, Ryan Eatmon via lists.yoctoproject.org wrote:
> Update all of the optee components to the upstream 4.0.0 version.
> 
> Signed-off-by: Ryan Eatmon <[email protected]>
> ---
>  meta-ti-bsp/recipes-security/optee/optee-client-ti.inc    | 4 ++--
>  meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc  | 4 ++--
>  .../recipes-security/optee/optee-os-tadevkit-ti.inc       | 5 +++--
>  meta-ti-bsp/recipes-security/optee/optee-os-ti.inc        | 4 ++--
>  meta-ti-bsp/recipes-security/optee/optee-test-ti.inc      | 8 ++++++--
>  5 files changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc 
> b/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc
> index fef87d30..f64a90c3 100644
> --- a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc
> +++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc
> @@ -1,5 +1,5 @@
> -PV = "3.20.0+git${SRCPV}"
> -SRCREV = "dd2d39b49975d2ada7870fe2b7f5a84d0d3860dc"
> +PV = "4.0.0+git${SRCPV}"
> +SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee"
>  
>  inherit pkgconfig
>  DEPENDS += "util-linux"
> diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc 
> b/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc
> index 7d119f0d..7a733f53 100644
> --- a/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc
> +++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc
> @@ -1,3 +1,3 @@
> -PV = "3.20.0+git${SRCPV}"
> -SRCREV = "a98d01e1b9168eaed96bcd0bac0df67c44a81081"
> +PV = "4.0.0+git${SRCPV}"
> +SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
>  SRC_URI:remove = 
> "file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.patch"
> diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc 
> b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc
> index 18820af1..c1354539 100644
> --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc
> +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc
> @@ -1,2 +1,3 @@
> -PV = "3.20.0+git${SRCPV}"
> -SRCREV = "8e74d47616a20eaa23ca692f4bbbf917a236ed94"
> +PV = "4.0.0+git${SRCPV}"
> +SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6"

If possible, can we pick the same SHA of optee-os itself for this
through some include file? I don't think it makes sense to update the
same SHA at two places for this tadevkit that I see always being in sync
with optee-os only. Ig this had been the missing piece in my testing
that I had missed updating that led to crashed for me. Upto you but just
a suggestion.

Regards,
Manorit
> +
> diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc 
> b/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc
> index 19386295..763dd1d5 100644
> --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc
> +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc
> @@ -1,5 +1,5 @@
> -PV = "3.20.0+git${SRCPV}"
> -SRCREV = "8e74d47616a20eaa23ca692f4bbbf917a236ed94"
> +PV = "4.0.0+git${SRCPV}"
> +SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6"
>  
>  # Use TI SECDEV for signing
>  inherit ti-secdev
> diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc 
> b/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc
> index 43e0172d..b68caf0c 100644
> --- a/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc
> +++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc
> @@ -1,2 +1,6 @@
> -PV = "3.19.0+git${SRCPV}"
> -SRCREV = "ab9863cc187724e54c032b738c28bd6e9460a4db"
> +PV = "4.0.0+git${SRCPV}"
> +SRCREV = "1c3d6be5eaa6174e3dbabf60928d15628e39b994"
> +
> +EXTRA_OEMAKE:append = " OPTEE_OPENSSL_EXPORT=${STAGING_INCDIR}"
> +DEPENDS:append = " openssl"
> +
> -- 
> 2.17.1
> 

> 
> 
> 

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

Reply via email to