From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28872C76188 for ; Tue, 4 Apr 2023 00:06:48 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.88944.1680566800385416553 for ; Mon, 03 Apr 2023 17:06:40 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 64E8340C3A; Tue, 4 Apr 2023 00:06:39 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id raxJ1WI3f2FW; Tue, 4 Apr 2023 00:06:39 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 3865A40429; Tue, 4 Apr 2023 00:06:36 +0000 (UTC) Received: by mail.denix.org (Postfix, from userid 1000) id B473E1637F6; Mon, 3 Apr 2023 20:05:59 -0400 (EDT) Date: Mon, 3 Apr 2023 20:05:59 -0400 From: Denys Dmytriyenko To: Adam Johnston Cc: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com, nd@arm.com Subject: Re: [meta-arm] [PATCH 1/1] arm-bsp/optee: Update OP-TEE TA devkit to 3.20 for N1SDP Message-ID: <20230404000559.GA9226@denix.org> References: <20230403154306.3422-1-adam.johnston@arm.com> <20230403154306.3422-2-adam.johnston@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230403154306.3422-2-adam.johnston@arm.com> User-Agent: Mutt/1.5.20 (2009-06-14) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 04 Apr 2023 00:06:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4536 On Mon, Apr 03, 2023 at 04:43:06PM +0100, Adam Johnston wrote: > From: Adam Johnston > > 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 > --- > .../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