Re: [meta-arm] [PATCH 1/1] arm-bsp/optee: Update OP-TEE TA devkit to 3.20 for N1SDP

[Denys Dmytriyenko <denis@denix.org>]

On Mon, Apr 03, 2023 at 04:43:06PM +0100, Adam Johnston wrote:
> From: Adam Johnston <adam.johnston@arm.com>
> 
> As optee-os for the N1SDP has been updated to 3.20 we need to do the
> same for optee-os-tavdekit. Otherwise errors will be seen if/when
> optee-os-tavdekit is built.

So, why only update it for N1SDP and not for everyone globally in meta-arm?


> Signed-off-by: Adam Johnston <adam.johnston@arm.com>
> ---
>  .../optee/optee-os-tadevkit_3.18.0.bbappend   |  1 -
>  .../optee/optee-os-tadevkit_3.20.0.bbappend   |  6 +++++
>  .../optee/optee-os-tadevkit_3.20.0.bb         | 24 +++++++++++++++++++
>  3 files changed, 30 insertions(+), 1 deletion(-)
>  create mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.20.0.bbappend
>  create mode 100644 meta-arm/recipes-security/optee/optee-os-tadevkit_3.20.0.bb
> 
> diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend
> index 9a210832..6a22d47e 100644
> --- a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend
> +++ b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend
> @@ -2,6 +2,5 @@
>  
>  MACHINE_OPTEE_OS_TADEVKIT_REQUIRE ?= ""
>  MACHINE_OPTEE_OS_TADEVKIT_REQUIRE:tc = "optee-os-generic-tc.inc"
> -MACHINE_OPTEE_OS_TADEVKIT_REQUIRE:n1sdp = "optee-os-n1sdp.inc"
>  
>  require ${MACHINE_OPTEE_OS_TADEVKIT_REQUIRE}
> diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.20.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.20.0.bbappend
> new file mode 100644
> index 00000000..e09c4a5e
> --- /dev/null
> +++ b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.20.0.bbappend
> @@ -0,0 +1,6 @@
> +# Machine specific configurations
> +
> +MACHINE_OPTEE_OS_TADEVKIT_REQUIRE ?= ""
> +MACHINE_OPTEE_OS_TADEVKIT_REQUIRE:n1sdp = "optee-os-n1sdp.inc"
> +
> +require ${MACHINE_OPTEE_OS_TADEVKIT_REQUIRE}
> diff --git a/meta-arm/recipes-security/optee/optee-os-tadevkit_3.20.0.bb b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.20.0.bb
> new file mode 100644
> index 00000000..202caa54
> --- /dev/null
> +++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.20.0.bb
> @@ -0,0 +1,24 @@
> +require optee-os_3.20.0.bb
> +
> +SUMMARY = "OP-TEE Trusted OS TA devkit"
> +DESCRIPTION = "OP-TEE TA devkit for build TAs"
> +HOMEPAGE = "https://www.op-tee.org/"
> +
> +DEPENDS += "python3-pycryptodome-native"
> +
> +do_install() {
> +    #install TA devkit
> +    install -d ${D}${includedir}/optee/export-user_ta/
> +    for f in ${B}/export-ta_${OPTEE_ARCH}/* ; do
> +        cp -aR $f ${D}${includedir}/optee/export-user_ta/
> +    done
> +}
> +
> +do_deploy() {
> +	echo "Do not inherit do_deploy from optee-os."
> +}
> +
> +FILES:${PN} = "${includedir}/optee/"
> +
> +# Build paths are currently embedded
> +INSANE_SKIP:${PN}-dev += "buildpaths"
> -- 
> 2.38.1