Ping. As master is now broken!

On Thu, Jan 12, 2023 at 06:12:12PM +0000, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <[email protected]>
> 
> Upstream meta-arm has updated optee-os to 3.19 and our local changes
> conflict with that. Update bbappend to match upstream.
> 
> Signed-off-by: Denys Dmytriyenko <[email protected]>
> ---
>  meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 9 ---------
>  1 file changed, 9 deletions(-)
> 
> diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend 
> b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
> index 8640d7b0..6f711101 100644
> --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
> +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
> @@ -1,12 +1,3 @@
> -PV:ti-soc = "3.19.0+git${SRCPV}"
> -SRCREV:ti-soc = "afacf356f9593a7f83cae9f96026824ec242ff52"
> -
> -# These patches are from upstream against v3.18, but we moved to v3.19 and 
> the
> -# patches are now invalid.  These can be removed once upstream moves up to or
> -# beyond v3.19.
> -SRC_URI:remove:ti-soc = "file://0008-no-warn-rwx-segments.patch"
> -SRC_URI:remove:ti-soc = "file://0009-add-z-execstack.patch"
> -
>  EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ 
> d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
>  
>  EXTRA_OEMAKE:append:am62xx = " CFG_WITH_SOFTWARE_PRNG=y 
> CFG_TEE_CORE_LOG_LEVEL=1"
> -- 
> 2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#15579): 
https://lists.yoctoproject.org/g/meta-ti/message/15579
Mute This Topic: https://lists.yoctoproject.org/mt/96228461/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to