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 403ACC433F5 for ; Thu, 3 Mar 2022 21:11:34 +0000 (UTC) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web10.16593.1646341892827389279 for ; Thu, 03 Mar 2022 13:11:33 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=Ev9b+1M9; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: alhe@linux.microsoft.com) Received: from [192.168.8.233] (cpe-70-112-59-126.austin.res.rr.com [70.112.59.126]) by linux.microsoft.com (Postfix) with ESMTPSA id 0FC7620B7178; Thu, 3 Mar 2022 13:11:29 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 0FC7620B7178 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1646341892; bh=ygWKOGosecjL3qNl5xs0n6SKKDlvqbuhG+yCw6+txDQ=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=Ev9b+1M9rm1I2mAgbktR7+g7726Jqp+fEt43gs0/LmheKUAMFkTUaHCSwbEYrksIr Qevv+LQWT0sac2BvaDfvoYc5noHIg6qUkdK9/dzyGtHNElcZpgHYTfMFFQ/nuU6lqF LWaGZhNu1z+XNI613MCiqpBbH6GPV2CPcLesDH9U= Content-Type: multipart/alternative; boundary="------------0FUxJR3lZLhIbe82myS8c0OG" Message-ID: <5d1418bf-6879-237d-7bc7-e7a1ff0024b0@linux.microsoft.com> Date: Thu, 3 Mar 2022 21:11:28 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [meta-arm] [PATCH] arm/optee: Upgrade from 3.14 to 3.16 Content-Language: en-US To: Abdellatif El Khlifi , Sumit Garg , Jon Mason Cc: "meta-arm@lists.yoctoproject.org" , Vishnu Banavath , Maxim Uvarov , Peter Griffin , Denys Dmytriyenko , Drew Reed References: <20220226030441.2301940-1-alhe@linux.microsoft.com> <73a2bdd2-c8d1-9d96-df50-044d76bd4ff7@linux.microsoft.com> From: Alejandro Hernandez In-Reply-To: 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 ; Thu, 03 Mar 2022 21:11:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3105 This is a multi-part message in MIME format. --------------0FUxJR3lZLhIbe82myS8c0OG Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable On 3/3/22 10:55, Abdellatif El Khlifi wrote: > Hello, > > I suggest the following: > > In meta-arm-bsp/conf/layer.conf add : > > LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot =3D " meta-python= =20 > openembedded-layer" This statement is a little confusing (to me), please correct me if I'm=20 wrong, but you're saying we should set a dependency from meta-arm-bsp layer, only for=20 qemuarm64-secureboot, however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bs= p, AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's=20 no other mention of qemuarm64-secureboot in meta-arm-bsp. Cheers, Alejandro > > In ci/qemuarm64-secureboot.yml add: > > ci/meta-openembedded.yml > > Kind regards > -----------------------------------------------------------------------= - > *From:* Sumit Garg > *Sent:* 03 March 2022 05:31 > *To:* Jon Mason ; Alejandro Hernandez=20 > > *Cc:* meta-arm@lists.yoctoproject.org=20 > ; Vishnu Banavath=20 > ; Maxim Uvarov ;=20 > Peter Griffin ; Denys Dmytriyenko=20 > ; Drew Reed ; Abdellatif El Khlifi=20 > > *Subject:* Re: [meta-arm] [PATCH] arm/optee: Upgrade from 3.14 to 3.16 > On Wed, 2 Mar 2022 at 20:16, Jon Mason wrote: > > > > On Tue, Mar 01, 2022 at 09:54:04PM +0000, Alejandro Hernandez wrote: > > > Hi John, > > > > > > On 3/1/22 16:27, Jon Mason wrote: > > > > On Fri, Feb 25, 2022 at 08:04:41PM -0700, Alejandro Enedino=20 > Hernandez Samaniego wrote: > > > > > - Removes upstreamed patches for optee-examples > > > > > - Fixes optee-examples installation > > > > > - Includes new python3-cryptography dependency > > > > > - Fixes python3-cryptography to work with openssl > > > > > > > > > > Tested on qemuarm64-secureboot via optee-examples xtest -l 15 > > > > With the new changes in python3-crypto, this is no longer working= . > > > > I'm seeing the following error in CI. > > > > > > > > --- Error summary --- > > > > ERROR: Nothing PROVIDES 'python3-cryptography-native' (but=20 > /builds/jonmason00/meta-arm/meta-arm/recipes-security/optee/optee-os_3.= 16.0.bb=20 > DEPENDS on or otherwise requires it). Close matches: > > > >=C2=A0=C2=A0=C2=A0 python3-cython-native > > > >=C2=A0=C2=A0=C2=A0 python3-pycryptodome-native > > > >=C2=A0=C2=A0=C2=A0 python3-typogrify-native > > > > > > > > I _think_ that adding meta-openembedded.yml being adding to the > > > > machines should fix it, but I'm not sure that is the right soluti= on. > > > > > > > > Thanks, > > > > Jon > > > > > > My apologies, I was testing with meta-oe/meta-python enabled hence=20 > I didnt > > > see the error before. > > > > > > > > > I'm not sure its the right solution either, this dependency is=20 > coming from > > > the pem_to_pub_c.py script which is now using python3-cyrptography=20 > since > > > commit=20 > https://github.com/OP-TEE/optee_os/commit/169eac19852d98d8ade821f913bbd= d76faf52823 > > > (this also means we could remove python3-cryptodome from the=20 > dependencies as > > > well), as far as I can tell this creates a hard dependency, passing > > > EXTRA_OEMAKE +=3D " CFG_WITH_USER_TA=3Dn" would avoid executing the= script > > > completely but I also dont think thats what we want. > > > > > > Should we include meta-openembedded.yml?,=C2=A0 or what other choic= e do=20 > we have? > > > create a python3-cyrptography recipe to meta-arm?, thoughts? > > Yes, we should include meta-openembedded.yml as a dependency and > remove python3-cryptodome from the dependencies. > > -Sumit > > > > > OPTEE isn't an area I understand well (to know whether removing this > > is superior to adding the dependency in the files). So, I'm directly > > cc'ing contributors that I think will have an opinion to this > > response. > > > > Thanks, > > Jon > > > > > > > > Cheers, > > > > > > Alejandro > > > > > > > > Signed-off-by: Alejandro Enedino Hernandez=20 > Samaniego > > > > > --- > > > > >=C2=A0=C2=A0 ....bbappend =3D> optee-client_3.16.0.bbappend} |=C2= =A0 0 > > > > >=C2=A0=C2=A0 ...pend =3D> optee-os-tadevkit_3.16.0.bbappend} |=C2= =A0 0 > > > > >=C2=A0=C2=A0 ...14.0.bbappend =3D> optee-os_3.16.0.bbappend} |=C2= =A0 0 > > > > >=C2=A0=C2=A0 ....0.bbappend =3D> optee-test_3.16.0.bbappend} |=C2= =A0 0 > > > > > .../optee-ftpm/optee-ftpm_git.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 8 +- > > > > > .../optee/optee-client_3.14.0.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 3 - > > > > > .../optee/optee-client_3.16.0.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 3 + > > > > > .../recipes-security/optee/optee-examples.inc |=C2=A0 7 +- > > > > > ...ix-non-portable-sh-check-for-plugins.patch | 46 ++++++++++ > > > > > ...efault-cross-compiler-environment-se.patch | 84=20 > ------------------- > > > > > ...nable-plugins-installation-in-rootfs.patch | 37 -------- > > > > > .../optee/optee-examples_3.14.0.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 4 - > > > > > .../optee/optee-examples_3.16.0.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 3 + > > > > >=C2=A0=C2=A0 ..._3.14.0.bb =3D> optee-os-tadevkit_3.16.0.bb} |=C2= =A0 3 +- > > > > > meta-arm/recipes-security/optee/optee-os.inc=C2=A0 |=C2=A0 2 +- > > > > >=C2=A0=C2=A0 ...{optee-os_3.14.0.bb =3D> optee-os_3.16.0.bb} |=C2= =A0 2 +- > > > > > .../recipes-security/optee/optee-test.inc=C2=A0=C2=A0=C2=A0=C2=A0= |=C2=A0 2 +- > > > > > .../optee/optee-test_3.14.0.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 3 - > > > > > .../optee/optee-test_3.16.0.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 3 + > > > > > meta-arm/recipes-security/optee/optee.inc=C2=A0=C2=A0=C2=A0=C2=A0= |=C2=A0 3 + > > > > >=C2=A0=C2=A0 20 files changed, 73 insertions(+), 140 deletions(-= ) > > > > >=C2=A0=C2=A0 rename=20 > meta-arm-bsp/recipes-security/optee/{optee-client_3.14.0.bbappend =3D>=20 > optee-client_3.16.0.bbappend} (100%) > > > > >=C2=A0=C2=A0 rename=20 > meta-arm-bsp/recipes-security/optee/{optee-os-tadevkit_3.14.0.bbappend=20 > =3D> optee-os-tadevkit_3.16.0.bbappend} (100%) > > > > >=C2=A0=C2=A0 rename=20 > meta-arm-bsp/recipes-security/optee/{optee-os_3.14.0.bbappend =3D>=20 > optee-os_3.16.0.bbappend} (100%) > > > > >=C2=A0=C2=A0 rename=20 > meta-arm-bsp/recipes-security/optee/{optee-test_3.14.0.bbappend =3D>=20 > optee-test_3.16.0.bbappend} (100%) > > > > >=C2=A0=C2=A0 delete mode 100644=20 > meta-arm/recipes-security/optee/optee-client_3.14.0.bb > > > > >=C2=A0=C2=A0 create mode 100644=20 > meta-arm/recipes-security/optee/optee-client_3.16.0.bb > > > > >=C2=A0=C2=A0 create mode 100644=20 > meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-po= rtable-sh-check-for-plugins.patch > > > > >=C2=A0=C2=A0 delete mode 100644=20 > meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-defa= ult-cross-compiler-environment-se.patch > > > > >=C2=A0=C2=A0 delete mode 100644=20 > meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plu= gins-installation-in-rootfs.patch > > > > >=C2=A0=C2=A0 delete mode 100644=20 > meta-arm/recipes-security/optee/optee-examples_3.14.0.bb > > > > >=C2=A0=C2=A0 create mode 100644=20 > meta-arm/recipes-security/optee/optee-examples_3.16.0.bb > > > > >=C2=A0=C2=A0 rename=20 > meta-arm/recipes-security/optee/{optee-os-tadevkit_3.14.0.bb =3D>=20 > optee-os-tadevkit_3.16.0.bb} (94%) > > > > >=C2=A0=C2=A0 rename meta-arm/recipes-security/optee/{optee-os_3.= 14.0.bb=20 > =3D> optee-os_3.16.0.bb} (76%) > > > > >=C2=A0=C2=A0 delete mode 100644=20 > meta-arm/recipes-security/optee/optee-test_3.14.0.bb > > > > >=C2=A0=C2=A0 create mode 100644=20 > meta-arm/recipes-security/optee/optee-test_3.16.0.bb > > > > > > > > > > diff --git=20 > a/meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend=20 > b/meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend > > > > > similarity index 100% > > > > > rename from=20 > meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend > > > > > rename to=20 > meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend > > > > > diff --git=20 > a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend= =20 > b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend > > > > > similarity index 100% > > > > > rename from=20 > meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.0.bbappend > > > > > rename to=20 > meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend > > > > > diff --git=20 > a/meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend=20 > b/meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend > > > > > similarity index 100% > > > > > rename from=20 > meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappend > > > > > rename to=20 > meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend > > > > > diff --git=20 > a/meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend=20 > b/meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend > > > > > similarity index 100% > > > > > rename from=20 > meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend > > > > > rename to=20 > meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend > > > > > diff --git=20 > a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb=20 > b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb > > > > > index f2a74da..0eb64cd 100644 > > > > > --- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb > > > > > +++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb > > > > > @@ -15,7 +15,9 @@ inherit deploy python3native > > > > >=C2=A0=C2=A0 LICENSE =3D "MIT" > > > > >=C2=A0=C2=A0 LIC_FILES_CHKSUM=20 > =3D"file://${S}/LICENSE;md5=3D27e94c0280987ab296b0b8dd02ab9fe5=20 > " > > > > > -DEPENDS =3D "python3-pycryptodome-native=20 > python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevki= t" > > > > > +DEPENDS =3D "python3-pycryptodome-native=20 > python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevki= t \ > > > > > +=C2=A0=C2=A0=C2=A0 python3-cryptography-native \ > > > > > +=C2=A0=C2=A0=C2=A0 " > > > > > FTPM_UUID=3D"bc50d971-d4c9-42c4-82cb-343fb7f37896" > > > > > @@ -48,6 +50,10 @@ EXTRA_OEMAKE:append:aarch64:qemuall =3D "\ > > > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 CFG_ARM64_ta_arm64=3Dy \ > > > > >=C2=A0=C2=A0 " > > > > > +# python3-cryptography needs the legacy provider, so set=20 > OPENSSL_MODULES to the > > > > > +# right path until this is relocated automatically. > > > > > +export OPENSSL_MODULES=3D"${STAGING_LIBDIR_NATIVE}/ossl-module= s" > > > > > + > > > > >=C2=A0=C2=A0 PARALLEL_MAKE =3D "" > > > > >=C2=A0=C2=A0 do_compile() { > > > > > diff --git=20 > a/meta-arm/recipes-security/optee/optee-client_3.14.0.bb=20 > b/meta-arm/recipes-security/optee/optee-client_3.14.0.bb > > > > > deleted file mode 100644 > > > > > index be78b88..0000000 > > > > > --- a/meta-arm/recipes-security/optee/optee-client_3.14.0.bb > > > > > +++ /dev/null > > > > > @@ -1,3 +0,0 @@ > > > > > -require optee-client.inc > > > > > - > > > > > -SRCREV =3D "06e1b32f6a7028e039c625b07cfc25fda0c17d53" > > > > > diff --git=20 > a/meta-arm/recipes-security/optee/optee-client_3.16.0.bb=20 > b/meta-arm/recipes-security/optee/optee-client_3.16.0.bb > > > > > new file mode 100644 > > > > > index 0000000..4a36cbc > > > > > --- /dev/null > > > > > +++ b/meta-arm/recipes-security/optee/optee-client_3.16.0.bb > > > > > @@ -0,0 +1,3 @@ > > > > > +require optee-client.inc > > > > > + > > > > > +SRCREV =3D "06db73b3f3fdb8d23eceaedbc46c49c0b45fd1e2" > > > > > diff --git=20 > a/meta-arm/recipes-security/optee/optee-examples.inc=20 > b/meta-arm/recipes-security/optee/optee-examples.inc > > > > > index 656722e..097f892 100644 > > > > > --- a/meta-arm/recipes-security/optee/optee-examples.inc > > > > > +++ b/meta-arm/recipes-security/optee/optee-examples.inc > > > > > @@ -5,16 +5,14 @@ HOMEPAGE=20 > =3D"https://github.com/linaro-swg/optee_examples" > > > > >=C2=A0=C2=A0 LICENSE =3D "BSD-2-Clause" > > > > >=C2=A0=C2=A0 LIC_FILES_CHKSUM=20 > =3D"file://LICENSE;md5=3Dcd95ab417e23b94f381dafc453d70c30=20 > " > > > > > -DEPENDS =3D "optee-client optee-os-tadevkit=20 > python3-pycryptodome-native" > > > > > +DEPENDS =3D "optee-client optee-os-tadevkit=20 > python3-pycryptodome-native python3-cryptography-native" > > > > >=C2=A0=C2=A0 inherit python3native > > > > >=C2=A0=C2=A0 require optee.inc > > > > >=C2=A0=C2=A0 SRC_URI =3D=20 > "git://github.com/linaro-swg/optee_examples.git;branch=3Dmaster;protoco= l=3Dhttps=20 > \ > > > > >=20 > -file://0001-plugins-Honour-default-cross-compiler-environment-se.patch= \ > > > > >=20 > -file://0002-Makefile-Enable-plugins-installation-in-rootfs.patch \ > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 " > > > > > +file://0001-Makefile-Fix-non-portable-sh-check-for-plugins.pat= ch" > > > > >=C2=A0=C2=A0 EXTRA_OEMAKE +=3D "TA_DEV_KIT_DIR=3D${TA_DEV_KIT_DI= R} \ > > > > > HOST_CROSS_COMPILE=3D${HOST_PREFIX} \ > > > > > @@ -25,6 +23,7 @@ EXTRA_OEMAKE +=3D=20 > "TA_DEV_KIT_DIR=3D${TA_DEV_KIT_DIR} \ > > > > >=C2=A0=C2=A0 S =3D "${WORKDIR}/git" > > > > >=C2=A0=C2=A0 B =3D "${WORKDIR}/build" > > > > > + > > > > >=C2=A0=C2=A0 do_compile() { > > > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 oe_runmake -C ${S} > > > > >=C2=A0=C2=A0 } > > > > > diff --git=20 > a/meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-= portable-sh-check-for-plugins.patch=20 > b/meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-= portable-sh-check-for-plugins.patch > > > > > new file mode 100644 > > > > > index 0000000..70add62 > > > > > --- /dev/null > > > > > +++=20 > b/meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-= portable-sh-check-for-plugins.patch > > > > > @@ -0,0 +1,46 @@ > > > > > +From 11610debf750f15c7a104db7315dcd7d69e282a8 Mon Sep 17=20 > 00:00:00 2001 > > > > > +From: Alejandro Enedino Hernandez=20 > Samaniego > > > > > +Date: Sat, 26 Feb 2022 01:52:26 +0000 > > > > > +Subject: [PATCH] Makefile: Fix non-portable sh check for plugi= ns > > > > > + > > > > > +Upstream-Status: Pending > > > > > + > > > > > +We previously held a patch that used "=3D" for comparison, but= when > > > > > +that patch got upstreamed it was changed to "=3D=3D" which is=20 > non-portable, > > > > > +resulting in an error: > > > > > + > > > > > +/bin/sh: 6: [: acipher: unexpected operator > > > > > +/bin/sh: 6: [: plugins: unexpected operator > > > > > +/bin/sh: 6: [: hello_world: unexpected operator > > > > > +/bin/sh: 6: [: hotp: unexpected operator > > > > > +/bin/sh: 6: [: aes: unexpected operator > > > > > +/bin/sh: 6: [: random: unexpected operator > > > > > +/bin/sh: 6: [: secure_storage: unexpected operator > > > > > + > > > > > +if /bin/sh doesnt point to bash. > > > > > + > > > > > +Which in turn causes our do_install task to fail since=20 > plugins arent > > > > > +where we expect them to be. > > > > > + > > > > > + > > > > > +Signed-off-by: Alejandro Enedino Hernandez=20 > Samaniego > > > > > +--- > > > > > + Makefile | 2 +- > > > > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > + > > > > > +diff --git a/Makefile b/Makefile > > > > > +index b3f16aa..9359d95 100644 > > > > > +--- a/Makefile > > > > > ++++ b/Makefile > > > > > +@@ -31,7 +31,7 @@ prepare-for-rootfs: examples > > > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 cp -p=20 > $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \ > > > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi; \ > > > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/= ta/; \ > > > > > +-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ $$example =3D=3D plugins ]; then \ > > > > > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ $$example =3D plugins ]; then \ > > > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 cp -p plugins/syslog/*.plugin=20 > $(OUTPUT_DIR)/plugins/; \ > > > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi; \ > > > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 done > > > > > +-- > > > > > +2.25.1 > > > > > + > > > > > diff --git=20 > a/meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-de= fault-cross-compiler-environment-se.patch=20 > b/meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-de= fault-cross-compiler-environment-se.patch > > > > > deleted file mode 100644 > > > > > index 033e48c..0000000 > > > > > ---=20 > a/meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-de= fault-cross-compiler-environment-se.patch > > > > > +++ /dev/null > > > > > @@ -1,84 +0,0 @@ > > > > > -From 79c826c249001700007a6dffe80c3d61ff4428ef Mon Sep 17=20 > 00:00:00 2001 > > > > > -From: Sumit Garg > > > > > -Date: Tue, 20 Jul 2021 13:54:30 +0530 > > > > > -Subject: [PATCH 1/2] plugins: Honour default cross compiler=20 > environment setup > > > > > - > > > > > -Honour default $(CC), $(CFLAGS) and $(LDFLAGS) variables.=20 > Without this > > > > > -plugins example fails to build for OE/Yocto. > > > > > - > > > > > -Upstream-Status: Submitted=20 > [https://github.com/linaro-swg/optee_examples/pull/87] > > > > > - > > > > > -Signed-off-by: Sumit Garg > > > > > ---- > > > > > - plugins/Makefile=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2= =A0 2 +- > > > > > - plugins/host/Makefile=C2=A0=C2=A0 |=C2=A0 2 +- > > > > > - plugins/syslog/Makefile | 16 ++++++++++++---- > > > > > - 3 files changed, 14 insertions(+), 6 deletions(-) > > > > > - > > > > > -diff --git a/plugins/Makefile b/plugins/Makefile > > > > > -index 2372b38..ea472b4 100644 > > > > > ---- a/plugins/Makefile > > > > > -+++ b/plugins/Makefile > > > > > -@@ -8,7 +8,7 @@ TA_CROSS_COMPILE ?=3D $(CROSS_COMPILE) > > > > > - all: > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(MAKE) -C ho= st=20 > CROSS_COMPILE=3D"$(HOST_CROSS_COMPILE)" --no-builtin-variables > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(MAKE) -C ta= CROSS_COMPILE=3D"$(TA_CROSS_COMPILE)"=20 > LDFLAGS=3D"" > > > > > --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(MAKE) -C syslog = CROSS_COMPILE=3D"$(HOST_CROSS_COMPILE)" > > > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(MAKE) -C syslog=20 > CROSS_COMPILE=3D"$(HOST_CROSS_COMPILE)" --no-builtin-variables > > > > > - > > > > > - .PHONY: clean > > > > > - clean: > > > > > -diff --git a/plugins/host/Makefile b/plugins/host/Makefile > > > > > -index 7285104..76244c7 100644 > > > > > ---- a/plugins/host/Makefile > > > > > -+++ b/plugins/host/Makefile > > > > > -@@ -20,7 +20,7 @@ BINARY =3D optee_example_plugins > > > > > - all: $(BINARY) > > > > > - > > > > > - $(BINARY): $(OBJS) > > > > > --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(CC) -o $@ $< $(L= DADD) > > > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(CC) $(LDFLAGS) -= o $@ $< $(LDADD) > > > > > - > > > > > - .PHONY: clean > > > > > - clean: > > > > > -diff --git a/plugins/syslog/Makefile b/plugins/syslog/Makefile > > > > > -index 62d916a..71f5f92 100644 > > > > > ---- a/plugins/syslog/Makefile > > > > > -+++ b/plugins/syslog/Makefile > > > > > -@@ -1,3 +1,11 @@ > > > > > -+CC=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ?=3D $(CROSS_COMPILE)gcc > > > > > -+LD=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ?=3D $(CROSS_COMPILE)ld > > > > > -+AR=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ?=3D $(CROSS_COMPILE)ar > > > > > -+NM=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ?=3D $(CROSS_COMPILE)nm > > > > > -+OBJCOPY ?=3D $(CROSS_COMPILE)objcopy > > > > > -+OBJDUMP ?=3D $(CROSS_COMPILE)objdump > > > > > -+READELF ?=3D $(CROSS_COMPILE)readelf > > > > > -+ > > > > > - PLUGIN_UUID =3D 96bcf744-4f72-4866-bf1d-8634fd9c65e5 > > > > > - > > > > > - PLUGIN=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D $(PLUGIN_UUID).plugin > > > > > -@@ -6,17 +14,17 @@ PLUGIN_OBJ=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D $(patsubst %.c,=20 > %.o, $(PLUGIN_SRS)) > > > > > - PLUGIN_INCLUDES_DIR=C2=A0=C2=A0=C2=A0=C2=A0 =3D $(CURDIR) $(T= EEC_EXPORT)/include > > > > > - > > > > > - PLUGIN_INCLUDES=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =3D $(addprefix -I,=20 > $(PLUGIN_INCLUDES_DIR)) > > > > > --PLUGIN_CCFLAGS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 =3D -Wall -fPIC > > > > > --PLUGIN_LDFLAGS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 =3D -shared > > > > > -+PLUGIN_CCFLAGS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 =3D $(CFLAGS) -Wall -fPIC > > > > > -+PLUGIN_LDFLAGS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 =3D $(LDFLAGS) -shared > > > > > - > > > > > - .PHONY: all > > > > > - all: $(PLUGIN) > > > > > - > > > > > - $(PLUGIN): $(PLUGIN_OBJ) > > > > > --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(CROSS_COMPILE)gc= c $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ)=20 > -o $@ > > > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(CC) $(PLUGIN_LDF= LAGS) $(PLUGIN_OBJ) -o $@ > > > > > - > > > > > - %.o: %.c > > > > > --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(CROSS_COMPILE)gc= c $(PLUGIN_CCFLAGS)=20 > $(PLUGIN_INCLUDES) -c $*.c -o $*.o > > > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(CC) $(PLUGIN_CCF= LAGS) $(PLUGIN_INCLUDES) -c $*.c=20 > -o $*.o > > > > > - > > > > > - .PHONY: clean > > > > > - clean: > > > > > --- > > > > > -2.25.1 > > > > > - > > > > > diff --git=20 > a/meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-p= lugins-installation-in-rootfs.patch=20 > b/meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-p= lugins-installation-in-rootfs.patch > > > > > deleted file mode 100644 > > > > > index 80e6b5f..0000000 > > > > > ---=20 > a/meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-p= lugins-installation-in-rootfs.patch > > > > > +++ /dev/null > > > > > @@ -1,37 +0,0 @@ > > > > > -From f4e5e74548d92258855434b550c58fe44993c148 Mon Sep 17=20 > 00:00:00 2001 > > > > > -From: Sumit Garg > > > > > -Date: Tue, 20 Jul 2021 14:20:10 +0530 > > > > > -Subject: [PATCH] Makefile: Enable plugins installation in root= fs > > > > > - > > > > > -Upstream-Status: Submitted=20 > [https://github.com/linaro-swg/optee_examples/pull/87] > > > > > - > > > > > -Signed-off-by: Sumit Garg > > > > > - > > > > > ---- > > > > > - Makefile | 5 +++++ > > > > > - 1 file changed, 5 insertions(+) > > > > > - > > > > > -diff --git a/Makefile b/Makefile > > > > > -index a275842..9359d95 100644 > > > > > ---- a/Makefile > > > > > -+++ b/Makefile > > > > > -@@ -25,14 +25,19 @@ prepare-for-rootfs: examples > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 @mkdir -p $(O= UTPUT_DIR) > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 @mkdir -p $(O= UTPUT_DIR)/ta > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 @mkdir -p $(O= UTPUT_DIR)/ca > > > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 @mkdir -p $(OUTPUT= _DIR)/plugins > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 @for example = in $(EXAMPLE_LIST); do \ > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ -e=20 > $$example/host/optee_example_$$example ]; then \ > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 cp -p=20 > $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \ > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi; \ > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/= ta/; \ > > > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ $$example =3D plugins ]; then \ > > > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= cp -p plugins/syslog/*.plugin=20 > $(OUTPUT_DIR)/plugins/; \ > > > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 fi; \ > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 done > > > > > - > > > > > - prepare-for-rootfs-clean: > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 @rm -rf $(OUT= PUT_DIR)/ta > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 @rm -rf $(OUT= PUT_DIR)/ca > > > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 @rm -rf $(OUTPUT_D= IR)/plugins > > > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 @rmdir --igno= re-fail-on-non-empty $(OUTPUT_DIR) ||=20 > test ! -e $(OUTPUT_DIR) > > > > > diff --git=20 > a/meta-arm/recipes-security/optee/optee-examples_3.14.0.bb=20 > b/meta-arm/recipes-security/optee/optee-examples_3.14.0.bb > > > > > deleted file mode 100644 > > > > > index f2b5f7d..0000000 > > > > > --- a/meta-arm/recipes-security/optee/optee-examples_3.14.0.bb > > > > > +++ /dev/null > > > > > @@ -1,4 +0,0 @@ > > > > > -require optee-examples.inc > > > > > - > > > > > -SRCREV =3D "e9c870525af8f7e7fccf575a0ca5394ce55adcec" > > > > > - > > > > > diff --git=20 > a/meta-arm/recipes-security/optee/optee-examples_3.16.0.bb=20 > b/meta-arm/recipes-security/optee/optee-examples_3.16.0.bb > > > > > new file mode 100644 > > > > > index 0000000..b5f6269 > > > > > --- /dev/null > > > > > +++ b/meta-arm/recipes-security/optee/optee-examples_3.16.0.bb > > > > > @@ -0,0 +1,3 @@ > > > > > +require optee-examples.inc > > > > > + > > > > > +SRCREV =3D "65fc74309e12189ad5b6ce3ffec37c8011088a5a" > > > > > diff --git=20 > a/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb=20 > b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb > > > > > similarity index 94% > > > > > rename from=20 > meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb > > > > > rename to=20 > meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb > > > > > index 0d37a52..c710e27 100644 > > > > > --- a/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.= bb > > > > > +++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.= bb > > > > > @@ -1,10 +1,11 @@ > > > > >=C2=A0=C2=A0 FILESEXTRAPATHS:prepend :=3D "${THISDIR}/optee-os:" > > > > > -require optee-os_3.14.0.bb > > > > > +require optee-os_3.16.0.bb > > > > >=C2=A0=C2=A0 SUMMARY =3D "OP-TEE Trusted OS TA devkit" > > > > >=C2=A0=C2=A0 DESCRIPTION =3D "OP-TEE TA devkit for build TAs" > > > > >=C2=A0=C2=A0 HOMEPAGE =3D"https://www.op-tee.org/" > > > > > + > > > > >=C2=A0=C2=A0 do_install() { > > > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #install TA devkit > > > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 install -d ${D}${includedir= }/optee/export-user_ta/ > > > > > diff --git a/meta-arm/recipes-security/optee/optee-os.inc=20 > b/meta-arm/recipes-security/optee/optee-os.inc > > > > > index 1506a58..57c64fd 100644 > > > > > --- a/meta-arm/recipes-security/optee/optee-os.inc > > > > > +++ b/meta-arm/recipes-security/optee/optee-os.inc > > > > > @@ -10,7 +10,7 @@ require optee.inc > > > > >=C2=A0=C2=A0 CVE_PRODUCT =3D "linaro:op-tee op-tee:op-tee_os" > > > > > -DEPENDS =3D "python3-pycryptodome-native python3-pyelftools-na= tive" > > > > > +DEPENDS =3D "python3-pycryptodome-native=20 > python3-pyelftools-native python3-cryptography-native" > > > > >=C2=A0=C2=A0 DEPENDS:append:toolchain-clang =3D " compiler-rt" > > > > > diff --git=20 > a/meta-arm/recipes-security/optee/optee-os_3.14.0.bb=20 > b/meta-arm/recipes-security/optee/optee-os_3.16.0.bb > > > > > similarity index 76% > > > > > rename from meta-arm/recipes-security/optee/optee-os_3.14.0.bb > > > > > rename to meta-arm/recipes-security/optee/optee-os_3.16.0.bb > > > > > index 95d82bb..873e964 100644 > > > > > --- a/meta-arm/recipes-security/optee/optee-os_3.14.0.bb > > > > > +++ b/meta-arm/recipes-security/optee/optee-os_3.16.0.bb > > > > > @@ -1,6 +1,6 @@ > > > > >=C2=A0=C2=A0 require optee-os.inc > > > > > -SRCREV =3D "d21befa5e53eae9db469eba1685f5aa5c6f92c2f" > > > > > +SRCREV =3D "d0b742d1564834dac903f906168d7357063d5459" > > > > >=C2=A0=C2=A0 SRC_URI:append =3D " \ > > > > > file://0006-allow-setting-sysroot-for-libgcc-lookup.patch=20 > =C2=A0 \ > > > > > diff --git a/meta-arm/recipes-security/optee/optee-test.inc=20 > b/meta-arm/recipes-security/optee/optee-test.inc > > > > > index aada243..33eda29 100644 > > > > > --- a/meta-arm/recipes-security/optee/optee-test.inc > > > > > +++ b/meta-arm/recipes-security/optee/optee-test.inc > > > > > @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM=20 > =3D"file://${S}/LICENSE.md;md5=3Ddaa2bcccc666345ab8940aab1315a4fa=20 > " > > > > >=C2=A0=C2=A0 inherit python3native ptest > > > > >=C2=A0=C2=A0 require optee.inc > > > > > -DEPENDS =3D "optee-client optee-os-tadevkit=20 > python3-pycryptodome-native" > > > > > +DEPENDS =3D "optee-client optee-os-tadevkit=20 > python3-pycryptodome-native python3-cryptography-native" > > > > >=C2=A0=C2=A0 SRC_URI =3D=20 > "git://github.com/OP-TEE/optee_test.git;branch=3Dmaster;protocol=3Dhttp= s \ > > > > > file://run-ptest \ > > > > > diff --git=20 > a/meta-arm/recipes-security/optee/optee-test_3.14.0.bb=20 > b/meta-arm/recipes-security/optee/optee-test_3.14.0.bb > > > > > deleted file mode 100644 > > > > > index 6367c27..0000000 > > > > > --- a/meta-arm/recipes-security/optee/optee-test_3.14.0.bb > > > > > +++ /dev/null > > > > > @@ -1,3 +0,0 @@ > > > > > -require optee-test.inc > > > > > - > > > > > -SRCREV =3D "f2eb88affbb7f028561b4fd5cbd049d5d704f741" > > > > > diff --git=20 > a/meta-arm/recipes-security/optee/optee-test_3.16.0.bb=20 > b/meta-arm/recipes-security/optee/optee-test_3.16.0.bb > > > > > new file mode 100644 > > > > > index 0000000..03f9c34 > > > > > --- /dev/null > > > > > +++ b/meta-arm/recipes-security/optee/optee-test_3.16.0.bb > > > > > @@ -0,0 +1,3 @@ > > > > > +require optee-test.inc > > > > > + > > > > > +SRCREV =3D "1cf0e6d2bdd1145370033d4e182634458528579d" > > > > > diff --git a/meta-arm/recipes-security/optee/optee.inc=20 > b/meta-arm/recipes-security/optee/optee.inc > > > > > index f02a022..beae366 100644 > > > > > --- a/meta-arm/recipes-security/optee/optee.inc > > > > > +++ b/meta-arm/recipes-security/optee/optee.inc > > > > > @@ -26,3 +26,6 @@ EXTRA_OEMAKE +=3D "V=3D1 \ > > > > > OPTEE_CLIENT_EXPORT=3D${STAGING_DIR_HOST}${prefix} \ > > > > > TEEC_EXPORT=3D${STAGING_DIR_HOST}${prefix} \ > > > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 " > > > > > +# python3-cryptography needs the legacy provider, so set=20 > OPENSSL_MODULES to the > > > > > +# right path until this is relocated automatically. > > > > > +export OPENSSL_MODULES=3D"${STAGING_LIBDIR_NATIVE}/ossl-module= s" > > > > > -- > > > > > 2.25.1 > > > > > > > > > > > > > > > > > > > > > > > > > > > -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- > Links: You receive all messages sent to this group. > View/Reply Online (#3096):https://lists.yoctoproject.org/g/meta-arm/mes= sage/3096 > Mute This Topic:https://lists.yoctoproject.org/mt/89404067/4354175 > Group Owner:meta-arm+owner@lists.yoctoproject.org > Unsubscribe:https://lists.yoctoproject.org/g/meta-arm/unsub [alhe@linu= x.microsoft.com] > -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- > --------------0FUxJR3lZLhIbe82myS8c0OG Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


On 3/3/22 10:55, Abdellatif El Khlifi wrote:
Hello,

I suggest the following:

In meta-arm-bsp/conf/layer.conf add :

LAYERDEPENDS_meta-arm-bsp:append:qemuarm64-secureboot =3D " meta-python openembedded-layer"


This statement is a little confusing (to me), please correct me if I'm wrong, but you're saying

we should set a dependency from meta-arm-bsp layer, only for qemuarm64-secureboot,

however, the qemuarm64-secureboot is part of meta-arm and not meta-arm-bsp,

AFAIC meta-arm-bsp has now knowledge of its existence, in fact there's no other mention of

qemuarm64-secureboot in meta-arm-bsp.


Cheers,


Alejandro


In ci/qemuarm64-secureboot.yml add:

ci/meta-openembedded.yml

Kind regards
On Wed, 2 Mar 2022 at 20:16, Jon Mason <jdmason@kudzu.us> wrote:
>
> On Tue, Mar 01, 2022 at 09:54:04PM +0000, Alejandro Hernandez wrote:
> > Hi John,
> >
> > On 3/1/22 16:27, Jon Mason wrote:
> > > On Fri, Feb 25, 2022 at 08:04:41PM -0700, Alejandro Enedino Hernandez Samaniego wrote:
> > > > - Removes upstreamed patches for optee-examples
> > > > - Fixes optee-examples installation
> > > > - Includes new python3-cryptography dependency
> > > > - Fixes python3-cryptography to work with openssl
> > > >
> > > > Tested on qemuarm64-secureboot via optee-examples xtest -l 15
> > > With the new changes in python3-crypto, this is no longer working.
> > > I'm seeing the following error in CI.
> > >
> > > --- Error summary ---
> > > ERROR: Nothing PROVIDES 'python3-cryptography-native' (but /builds/jonmason00/meta-arm/meta-arm/recipes-security/optee/optee-os_3.16= .0.bb DEPENDS on or otherwise requires it). Close matches:
> > >=C2=A0=C2=A0=C2=A0 python3-cython-native
> > >=C2=A0=C2=A0=C2=A0 python3-pycryptodome-nativ= e
> > >=C2=A0=C2=A0=C2=A0 python3-typogrify-native > > >
> > > I _think_ that adding meta-openembedded.yml being adding to the
> > > machines should fix it, but I'm not sure that is the right solution.
> > >
> > > Thanks,
> > > Jon
> >
> > My apologies, I was testing with meta-oe/meta-python enabled hence I didnt
> > see the error before.
> >
> >
> > I'm not sure its the right solution either, this dependency is coming from
> > the pem_to_pub_c.py script which is now using python3-cyrptography since
> > commit https://github.com/OP-TEE/optee_os/commit/169eac19852d98d8ade821f913bbdd7= 6faf52823
> > (this also means we could remove python3-cryptodome from the dependencies as
> > well), as far as I can tell this creates a hard dependency, passing
> > EXTRA_OEMAKE +=3D " CFG_WITH_USER_TA=3Dn" would avoid executing the script
> > completely but I also dont think thats what we want.
> >
> > Should we include meta-openembedded.yml?,=C2=A0 o= r what other choice do we have?
> > create a python3-cyrptography recipe to meta-arm?, thoughts?

Yes, we should include meta-openembedded.yml as a dependency and
remove python3-cryptodome from the dependencies.

-Sumit

>
> OPTEE isn't an area I understand well (to know whether removing this
> is superior to adding the dependency in the files).=C2= =A0 So, I'm directly
> cc'ing contributors that I think will have an opinion to this
> response.
>
> Thanks,
> Jon
>
> >
> > Cheers,
> >
> > Alejandro
> >
> > > > Signed-off-by: Alejandro Enedino Hernandez Samaniego<alhe@linux.microsoft.com> > > > > ---
> > > >=C2=A0=C2=A0 ....bbappend =3D> optee-client_3.16.0.bbappend} |=C2=A0 0
> > > >=C2=A0=C2=A0 ...pend =3D> optee-os-tadevkit_3.16.0.bbappend} |=C2=A0 0
> > > >=C2=A0=C2=A0 ...14.0.bbappend =3D> optee-os_3.16.0.bbappend} |=C2=A0 0
> > > >=C2=A0=C2=A0 ....0.bbappend =3D> optee-test_3.16.0.bbappend} |=C2=A0 0
> > > >=C2=A0=C2=A0 .../optee-ftpm/optee-ftpm_git.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 8 +-
> > > >=C2=A0=C2=A0 .../optee/optee-client_3.14.0.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 3 -
> > > >=C2=A0=C2=A0 .../optee/optee-client_3.16.0.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 3 +
> > > >=C2=A0=C2=A0 .../recipes-security/optee/optee-examples.inc |=C2=A0 7 +-<= br> > > > >=C2=A0=C2=A0 ...ix-non-portable-sh-check-for-plugins.patch | 46 ++++++++++
> > > >=C2=A0=C2=A0 ...efault-cross-compiler-environment-se.patch | 84 -------------------
> > > >=C2=A0=C2=A0 ...nable-plugins-installation-in-rootfs.patch | 37 --------
> > > >=C2=A0=C2=A0 .../optee/optee-examples_3.14.0.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 4 -
> > > >=C2=A0=C2=A0 .../optee/optee-examples_3.16.0.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 3 +
> > > >=C2=A0=C2=A0 ..._3.14.0.bb =3D> optee-os-tadevkit_3.16.0.bb} |=C2=A0 3 +-
> > > >=C2=A0=C2=A0 meta-arm/recipes-security/optee/optee-os.inc=C2=A0 |=C2=A0 = 2 +-
> > > >=C2=A0=C2=A0 ...{optee-os_3.14.0.bb =3D&= gt; optee-os_3.16.0.bb} |=C2=A0 2 +-
> > > >=C2=A0=C2=A0 .../recipes-security/optee/optee-test.inc=C2=A0=C2=A0=C2=A0= =C2=A0 |=C2=A0 2 +-
> > > >=C2=A0=C2=A0 .../optee/optee-test_3.14.0.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 3 -<= br> > > > >=C2=A0=C2=A0 .../optee/optee-test_3.16.0.bb=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 3 +<= br> > > > >=C2=A0=C2=A0 meta-arm/recipes-security/optee/optee.inc=C2=A0=C2=A0=C2=A0= =C2=A0 |=C2=A0 3 +
> > > >=C2=A0=C2=A0 20 files changed, 73 insert= ions(+), 140 deletions(-)
> > > >=C2=A0=C2=A0 rename meta-arm-bsp/recipes-security/optee/{optee-client_3.14.0.bb= append =3D> optee-client_3.16.0.bbappend} (100%)
> > > >=C2=A0=C2=A0 rename meta-arm-bsp/recipes-security/optee/{optee-os-tadevkit_3.14= .0.bbappend =3D> optee-os-tadevkit_3.16.0.bbappend} (100%)
> > > >=C2=A0=C2=A0 rename meta-arm-bsp/recipes-security/optee/{optee-os_3.14.0.bbappe= nd =3D> optee-os_3.16.0.bbappend} (100%)
> > > >=C2=A0=C2=A0 rename meta-arm-bsp/recipes-security/optee/{optee-test_3.14.0.bbap= pend =3D> optee-test_3.16.0.bbappend} (100%)
> > > >=C2=A0=C2=A0 delete mode 100644 meta-arm/recipes-security/optee/optee-client_3.14.0.bb
> > > >=C2=A0=C2=A0 create mode 100644 meta-arm/recipes-security/optee/optee-client_3.16.0.bb
> > > >=C2=A0=C2=A0 create mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-port= able-sh-check-for-plugins.patch
> > > >=C2=A0=C2=A0 delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-defaul= t-cross-compiler-environment-se.patch
> > > >=C2=A0=C2=A0 delete mode 100644 meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plugi= ns-installation-in-rootfs.patch
> > > >=C2=A0=C2=A0 delete mode 100644 meta-arm/recipes-security/optee/optee-examples_3.14.0.bb > > > >=C2=A0=C2=A0 create mode 100644 meta-arm/recipes-security/optee/optee-examples_3.16.0.bb > > > >=C2=A0=C2=A0 rename meta-arm/recipes-security/optee/{optee-os-tadevkit_3.14.0.b= b =3D> optee-os-tadevkit_3.16.0.bb} (94%)
> > > >=C2=A0=C2=A0 rename meta-arm/recipes-security/optee/{optee-os_3.14.0.bb =3D> optee-os_3.16.0.bb} (76%)
> > > >=C2=A0=C2=A0 delete mode 100644 meta-arm/recipes-security/optee/optee-test_3.14.0.bb
> > > >=C2=A0=C2=A0 create mode 100644 meta-arm/recipes-security/optee/optee-test_3.16.0.bb
> > > >
> > > > diff --git a/meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.b= bappend b/meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend
> > > > similarity index 100%
> > > > rename from meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bba= ppend
> > > > rename to meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bba= ppend
> > > > diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.1= 4.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend > > > > similarity index 100%
> > > > rename from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.14.= 0.bbappend
> > > > rename to meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.= 0.bbappend
> > > > diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbapp= end b/meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend
> > > > similarity index 100%
> > > > rename from meta-arm-bsp/recipes-security/optee/optee-os_3.14.0.bbappen= d
> > > > rename to meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappen= d
> > > > diff --git a/meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bba= ppend b/meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend
> > > > similarity index 100%
> > > > rename from meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbapp= end
> > > > rename to meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbapp= end
> > > > diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb > > > > index f2a74da..0eb64cd 100644
> > > > --- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb > > > > +++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb > > > > @@ -15,7 +15,9 @@ inherit deploy python3native
> > > >=C2=A0=C2=A0 LICENSE =3D "MIT"
> > > >=C2=A0=C2=A0 LIC_FILES_CHKSUM =3D"file://${S}/LICENSE;md5=3D27e94c= 0280987ab296b0b8dd02ab9fe5"
> > > > -DEPENDS =3D "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit"
> > > > +DEPENDS =3D "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native optee-os-tadevkit \
> > > > +=C2=A0=C2=A0=C2=A0 python3-cryptograph= y-native \
> > > > +=C2=A0=C2=A0=C2=A0 "
> > > >=C2=A0=C2=A0 FTPM_UUID=3D"bc50d971-d4c9-42c4-82cb-343fb7f37896"
> > > > @@ -48,6 +50,10 @@ EXTRA_OEMAKE:append:aarch64:qemuall =3D "\
> > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 CFG= _ARM64_ta_arm64=3Dy \
> > > >=C2=A0=C2=A0 "
> > > > +# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
> > > > +# right path until this is relocated automatically.
> > > > +export OPENSSL_MODULES=3D"${STAGING_LIBDIR_NATIVE}/ossl-modules" > > > > +
> > > >=C2=A0=C2=A0 PARALLEL_MAKE =3D ""
> > > >=C2=A0=C2=A0 do_compile() {
> > > > diff --git a/meta-arm/recipes-security/optee/optee-client_3.14.0.bb b/meta-arm/recipes-security/optee/optee-client_3.14.0.bb > > > > deleted file mode 100644
> > > > index be78b88..0000000
> > > > --- a/meta-arm/recipes-security/optee/optee-client_3.14.0.bb > > > > +++ /dev/null
> > > > @@ -1,3 +0,0 @@
> > > > -require optee-client.inc
> > > > -
> > > > -SRCREV =3D "06e1b32f6a7028e039c625b07cfc25fda0c17d53"
> > > > diff --git a/meta-arm/recipes-security/optee/optee-client_3.16.0.bb b/meta-arm/recipes-security/optee/optee-client_3.16.0.bb > > > > new file mode 100644
> > > > index 0000000..4a36cbc
> > > > --- /dev/null
> > > > +++ b/meta-arm/recipes-security/optee/optee-client_3.16.0.bb > > > > @@ -0,0 +1,3 @@
> > > > +require optee-client.inc
> > > > +
> > > > +SRCREV =3D "06db73b3f3fdb8d23eceaedbc46c49c0b45fd1e2"
> > > > diff --git a/meta-arm/recipes-security/optee/optee-examples.inc b/meta-arm/recipes-security/optee/optee-examples.inc
> > > > index 656722e..097f892 100644
> > > > --- a/meta-arm/recipes-security/optee/optee-examples.inc
> > > > +++ b/meta-arm/recipes-security/optee/optee-examples.inc
> > > > @@ -5,16 +5,14 @@ HOMEPAGE =3D"= https://github.com/linaro-swg/optee_examples"
> > > >=C2=A0=C2=A0 LICENSE =3D "BSD-2-Clause"<= br> > > > >=C2=A0=C2=A0 LIC_FILES_CHKSUM =3D"file://LICENSE;md5=3Dcd95ab417e2= 3b94f381dafc453d70c30"
> > > > -DEPENDS =3D "optee-client optee-os-tadevkit python3-pycryptodome-native"
> > > > +DEPENDS =3D "optee-client optee-os-tadevkit python3-pycryptodome-native python3-cryptography-native"
> > > >=C2=A0=C2=A0 inherit python3native
> > > >=C2=A0=C2=A0 require optee.inc
> > > >=C2=A0=C2=A0 SRC_URI =3D "git://github.com/linaro-swg/optee_examples.git;branch=3Dmaster;protocol=3D= https \
> > > > -file://0001-plugins-Honour-default-cross-compiler-environm= ent-se.patch=C2=A0 \
> > > > -file://0002-Makefile-Enable-plugins-installation-in-rootfs= .patch=C2=A0 \
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 "
> > > > +file://0001-Makefile-Fix-non-portable-sh-check-for-plugins= .patch"
> > > >=C2=A0=C2=A0 EXTRA_OEMAKE +=3D "TA_DEV_KIT_DIR=3D${TA_DEV_KIT_DIR} \
> > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 HOST_CROSS_COMPILE=3D${HOST_PREFIX} \
> > > > @@ -25,6 +23,7 @@ EXTRA_OEMAKE +=3D "TA_DEV_KIT_DIR=3D${TA_DEV_KIT_DIR} \
> > > >=C2=A0=C2=A0 S =3D "${WORKDIR}/git"
> > > >=C2=A0=C2=A0 B =3D "${WORKDIR}/build" > > > > +
> > > >=C2=A0=C2=A0 do_compile() {
> > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 oe_= runmake -C ${S}
> > > >=C2=A0=C2=A0 }
> > > > diff --git a/meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-po= rtable-sh-check-for-plugins.patch b/meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-po= rtable-sh-check-for-plugins.patch
> > > > new file mode 100644
> > > > index 0000000..70add62
> > > > --- /dev/null
> > > > +++ b/meta-arm/recipes-security/optee/optee-examples/0001-Makefile-Fix-non-po= rtable-sh-check-for-plugins.patch
> > > > @@ -0,0 +1,46 @@
> > > > +From 11610debf750f15c7a104db7315dcd7d69e282a8 Mon Sep 17 00:00:00 2001
> > > > +From: Alejandro Enedino Hernandez Samaniego<alhe@linux.microsoft.com>
> > > > +Date: Sat, 26 Feb 2022 01:52:26 +0000<= br> > > > > +Subject: [PATCH] Makefile: Fix non-portable sh check for plugins
> > > > +
> > > > +Upstream-Status: Pending
> > > > +
> > > > +We previously held a patch that used "=3D" for comparison, but when
> > > > +that patch got upstreamed it was changed to "=3D=3D" which is non-portable,
> > > > +resulting in an error:
> > > > +
> > > > +/bin/sh: 6: [: acipher: unexpected operator
> > > > +/bin/sh: 6: [: plugins: unexpected operator
> > > > +/bin/sh: 6: [: hello_world: unexpected operator
> > > > +/bin/sh: 6: [: hotp: unexpected operator
> > > > +/bin/sh: 6: [: aes: unexpected operator
> > > > +/bin/sh: 6: [: random: unexpected operator
> > > > +/bin/sh: 6: [: secure_storage: unexpected operator
> > > > +
> > > > +if /bin/sh doesnt point to bash.
> > > > +
> > > > +Which in turn causes our do_install task to fail since plugins arent
> > > > +where we expect them to be.
> > > > +
> > > > +
> > > > +Signed-off-by: Alejandro Enedino Hernandez Samaniego<alhe@linux.microsoft.com> > > > > +---
> > > > + Makefile | 2 +-
> > > > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > > > +
> > > > +diff --git a/Makefile b/Makefile
> > > > +index b3f16aa..9359d95 100644
> > > > +--- a/Makefile
> > > > ++++ b/Makefile
> > > > +@@ -31,7 +31,7 @@ prepare-for-rootfs: examples
> > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cp -p $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \
> > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi; \
> > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
> > > > +-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ $$example =3D=3D plugins ]; then \
> > > > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ $$example =3D plugins ]; then \
> > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cp -p plugins/syslog/*.plugin $(OUTPUT_DIR)/plugins/; \
> > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi; \
> > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 done
> > > > +--
> > > > +2.25.1
> > > > +
> > > > diff --git a/meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-defa= ult-cross-compiler-environment-se.patch b/meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-defa= ult-cross-compiler-environment-se.patch
> > > > deleted file mode 100644
> > > > index 033e48c..0000000
> > > > --- a/meta-arm/recipes-security/optee/optee-examples/0001-plugins-Honour-defa= ult-cross-compiler-environment-se.patch
> > > > +++ /dev/null
> > > > @@ -1,84 +0,0 @@
> > > > -From 79c826c249001700007a6dffe80c3d61ff4428ef Mon Sep 17 00:00:00 2001
> > > > -From: Sumit Garg<sumit.garg@linaro.org>
> > > > -Date: Tue, 20 Jul 2021 13:54:30 +0530<= br> > > > > -Subject: [PATCH 1/2] plugins: Honour default cross compiler environment setup
> > > > -
> > > > -Honour default $(CC), $(CFLAGS) and $(LDFLAGS) variables. Without this
> > > > -plugins example fails to build for OE/Yocto.
> > > > -
> > > > -Upstream-Status: Submitted [= https://github.com/linaro-swg/optee_examples/pull/87]
> > > > -
> > > > -Signed-off-by: Sumit Garg<sumit.garg@linaro.org>
> > > > ----
> > > > - plugins/Makefile=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
> > > > - plugins/host/Makefile=C2=A0=C2=A0 |=C2= =A0 2 +-
> > > > - plugins/syslog/Makefile | 16 ++++++++++++----
> > > > - 3 files changed, 14 insertions(+), 6 deletions(-)
> > > > -
> > > > -diff --git a/plugins/Makefile b/plugins/Makefile
> > > > -index 2372b38..ea472b4 100644
> > > > ---- a/plugins/Makefile
> > > > -+++ b/plugins/Makefile
> > > > -@@ -8,7 +8,7 @@ TA_CROSS_COMPILE ?=3D $(CROSS_COMPILE)
> > > > - all:
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 $(MAKE) -C host CROSS_COMPILE=3D"$(HOST_CROSS_COMPILE)" --no-builtin-variables
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 $(MAKE) -C ta CROSS_COMPILE=3D"$(TA_CROSS_COMPILE)" LDFLAGS=3D""
> > > > --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 $(MAKE) -C syslog CROSS_COMPILE=3D"$(HOST_CROSS_COMPILE)"
> > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 $(MAKE) -C syslog CROSS_COMPILE=3D"$(HOST_CROSS_COMPILE)" --no-builtin-variables
> > > > -
> > > > - .PHONY: clean
> > > > - clean:
> > > > -diff --git a/plugins/host/Makefile b/plugins/host/Makefile
> > > > -index 7285104..76244c7 100644
> > > > ---- a/plugins/host/Makefile
> > > > -+++ b/plugins/host/Makefile
> > > > -@@ -20,7 +20,7 @@ BINARY =3D optee_example_plugins
> > > > - all: $(BINARY)
> > > > -
> > > > - $(BINARY): $(OBJS)
> > > > --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 $(CC) -o $@ $< $(LDADD)
> > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 $(CC) $(LDFLAGS) -o $@ $< $(LDADD)
> > > > -
> > > > - .PHONY: clean
> > > > - clean:
> > > > -diff --git a/plugins/syslog/Makefile b/plugins/syslog/Makefile
> > > > -index 62d916a..71f5f92 100644
> > > > ---- a/plugins/syslog/Makefile
> > > > -+++ b/plugins/syslog/Makefile
> > > > -@@ -1,3 +1,11 @@
> > > > -+CC=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ?=3D= $(CROSS_COMPILE)gcc
> > > > -+LD=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ?=3D= $(CROSS_COMPILE)ld
> > > > -+AR=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ?=3D= $(CROSS_COMPILE)ar
> > > > -+NM=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ?=3D= $(CROSS_COMPILE)nm
> > > > -+OBJCOPY ?=3D $(CROSS_COMPILE)objcopy<= br> > > > > -+OBJDUMP ?=3D $(CROSS_COMPILE)objdump<= br> > > > > -+READELF ?=3D $(CROSS_COMPILE)readelf<= br> > > > > -+
> > > > - PLUGIN_UUID =3D 96bcf744-4f72-4866-bf1d-8634fd9c65e5
> > > > -
> > > > - PLUGIN=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D $(PLUGIN_UUID).plugin
> > > > -@@ -6,17 +14,17 @@ PLUGIN_OBJ=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 =3D $(patsubst %.c, %.o, $(PLUGIN_SRS))
> > > > - PLUGIN_INCLUDES_DIR=C2=A0=C2=A0=C2=A0= =C2=A0 =3D $(CURDIR) $(TEEC_EXPORT)/include
> > > > -
> > > > - PLUGIN_INCLUDES=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 =3D $(addprefix -I, $(PLUGIN_INCLUDES_DIR))
> > > > --PLUGIN_CCFLAGS=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D -Wall -fPIC
> > > > --PLUGIN_LDFLAGS=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D -shared
> > > > -+PLUGIN_CCFLAGS=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D $(CFLAGS) -Wall -fPIC
> > > > -+PLUGIN_LDFLAGS=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D $(LDFLAGS) -shared
> > > > -
> > > > - .PHONY: all
> > > > - all: $(PLUGIN)
> > > > -
> > > > - $(PLUGIN): $(PLUGIN_OBJ)
> > > > --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 $(CROSS_COMPILE)gcc $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) -o $@
> > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 $(CC) $(PLUGIN_LDFLAGS) $(PLUGIN_OBJ) -o $@
> > > > -
> > > > - %.o: %.c
> > > > --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 $(CROSS_COMPILE)gcc $(PLUGIN_CCFLAGS) $(PLUGIN_INCLUDES) -c $*.c -o $*.o
> > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 $(CC) $(PLUGIN_CCFLAGS) $(PLUGIN_INCLUDES) -c $*.c -o $*.o
> > > > -
> > > > - .PHONY: clean
> > > > - clean:
> > > > ---
> > > > -2.25.1
> > > > -
> > > > diff --git a/meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plu= gins-installation-in-rootfs.patch b/meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plu= gins-installation-in-rootfs.patch
> > > > deleted file mode 100644
> > > > index 80e6b5f..0000000
> > > > --- a/meta-arm/recipes-security/optee/optee-examples/0002-Makefile-Enable-plu= gins-installation-in-rootfs.patch
> > > > +++ /dev/null
> > > > @@ -1,37 +0,0 @@
> > > > -From f4e5e74548d92258855434b550c58fe44993c148 Mon Sep 17 00:00:00 2001
> > > > -From: Sumit Garg<sumit.garg@linaro.org>
> > > > -Date: Tue, 20 Jul 2021 14:20:10 +0530<= br> > > > > -Subject: [PATCH] Makefile: Enable plugins installation in rootfs
> > > > -
> > > > -Upstream-Status: Submitted [= https://github.com/linaro-swg/optee_examples/pull/87]
> > > > -
> > > > -Signed-off-by: Sumit Garg<sumit.garg@linaro.org>
> > > > -
> > > > ----
> > > > - Makefile | 5 +++++
> > > > - 1 file changed, 5 insertions(+)
> > > > -
> > > > -diff --git a/Makefile b/Makefile
> > > > -index a275842..9359d95 100644
> > > > ---- a/Makefile
> > > > -+++ b/Makefile
> > > > -@@ -25,14 +25,19 @@ prepare-for-rootfs: examples
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 @mkdir -p $(OUTPUT_DIR)
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 @mkdir -p $(OUTPUT_DIR)/ta
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 @mkdir -p $(OUTPUT_DIR)/ca
> > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 @mkdir -p $(OUTPUT_DIR)/plugins
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 @for example in $(EXAMPLE_LIST); do \
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ -e $$example/host/optee_example_$$example ]; then \
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cp -p $$example/host/optee_example_$$example $(OUTPUT_DIR)/ca/; \
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi; \
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cp -pr $$example/ta/*.ta $(OUTPUT_DIR)/ta/; \
> > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ $$example =3D plugins ]; then \
> > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 cp -p plugins/syslog/*.plugin $(OUTPUT_DIR)/plugins/; \
> > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi; \
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 done
> > > > -
> > > > - prepare-for-rootfs-clean:
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 @rm -rf $(OUTPUT_DIR)/ta
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 @rm -rf $(OUTPUT_DIR)/ca
> > > > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 @rm -rf $(OUTPUT_DIR)/plugins
> > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 @rmdir --ignore-fail-on-non-empty $(OUTPUT_DIR) || test ! -e $(OUTPUT_DIR)
> > > > diff --git a/meta-arm/recipes-security/optee/optee-examples_3.14.0.bb b/meta-arm/recipes-security/optee/optee-examples_3.14.0.bb<= br> > > > > deleted file mode 100644
> > > > index f2b5f7d..0000000
> > > > --- a/meta-arm/recipes-security/optee/optee-examples_3.14.0.bb<= br> > > > > +++ /dev/null
> > > > @@ -1,4 +0,0 @@
> > > > -require optee-examples.inc
> > > > -
> > > > -SRCREV =3D "e9c870525af8f7e7fccf575a0ca5394ce55adcec"
> > > > -
> > > > diff --git a/meta-arm/recipes-security/optee/optee-examples_3.16.0.bb b/meta-arm/recipes-security/optee/optee-examples_3.16.0.bb<= br> > > > > new file mode 100644
> > > > index 0000000..b5f6269
> > > > --- /dev/null
> > > > +++ b/meta-arm/recipes-security/optee/optee-examples_3.16.0.bb<= br> > > > > @@ -0,0 +1,3 @@
> > > > +require optee-examples.inc
> > > > +
> > > > +SRCREV =3D "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
> > > > diff --git a/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.= bb b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb
> > > > similarity index 94%
> > > > rename from meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb=
> > > > rename to meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.bb=
> > > > index 0d37a52..c710e27 100644
> > > > --- a/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.= bb
> > > > +++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.16.0.= bb
> > > > @@ -1,10 +1,11 @@
> > > >=C2=A0=C2=A0 FILESEXTRAPATHS:prepend :=3D "${THISDIR}/optee-os:"
> > > > -require optee-os_3.14.0.bb
> > > > +require optee-os_3.16.0.bb
> > > >=C2=A0=C2=A0 SUMMARY =3D "OP-TEE Trusted= OS TA devkit"
> > > >=C2=A0=C2=A0 DESCRIPTION =3D "OP-TEE TA = devkit for build TAs"
> > > >=C2=A0=C2=A0 HOMEPAGE =3D"https://www.op-tee.org/"
> > > > +
> > > >=C2=A0=C2=A0 do_install() {
> > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #in= stall TA devkit
> > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ins= tall -d ${D}${includedir}/optee/export-user_ta/
> > > > diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc
> > > > index 1506a58..57c64fd 100644
> > > > --- a/meta-arm/recipes-security/optee/optee-os.inc
> > > > +++ b/meta-arm/recipes-security/optee/optee-os.inc
> > > > @@ -10,7 +10,7 @@ require optee.inc
> > > >=C2=A0=C2=A0 CVE_PRODUCT =3D "linaro:op-= tee op-tee:op-tee_os"
> > > > -DEPENDS =3D "python3-pycryptodome-native python3-pyelftools-native"
> > > > +DEPENDS =3D "python3-pycryptodome-native python3-pyelftools-native python3-cryptography-native"
> > > >=C2=A0=C2=A0 DEPENDS:append:toolchain-cl= ang =3D " compiler-rt"
> > > > diff --git a/meta-arm/recipes-security/optee/optee-os_3.14.0.bb b/meta-arm/recipes-security/optee/optee-os_3.16.0.bb
> > > > similarity index 76%
> > > > rename from meta-arm/recipes-security/optee/optee-os_3.14.0.bb
> > > > rename to meta-arm/recipes-security/optee/optee-os_3.16.0.bb
> > > > index 95d82bb..873e964 100644
> > > > --- a/meta-arm/recipes-security/optee/optee-os_3.14.0.bb
> > > > +++ b/meta-arm/recipes-security/optee/optee-os_3.16.0.bb
> > > > @@ -1,6 +1,6 @@
> > > >=C2=A0=C2=A0 require optee-os.inc
> > > > -SRCREV =3D "d21befa5e53eae9db469eba1685f5aa5c6f92c2f"
> > > > +SRCREV =3D "d0b742d1564834dac903f906168d7357063d5459"
> > > >=C2=A0=C2=A0 SRC_URI:append =3D " \
> > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 file://0006-allow-setting-sysroot-for-libgcc-lookup.patch=C2=A0 \
> > > > diff --git a/meta-arm/recipes-security/optee/optee-test.inc b/meta-arm/recipes-security/optee/optee-test.inc
> > > > index aada243..33eda29 100644
> > > > --- a/meta-arm/recipes-security/optee/optee-test.inc
> > > > +++ b/meta-arm/recipes-security/optee/optee-test.inc
> > > > @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM =3D"file://${S}/LICENSE.md;md5=3Ddaa= 2bcccc666345ab8940aab1315a4fa"
> > > >=C2=A0=C2=A0 inherit python3native ptest=
> > > >=C2=A0=C2=A0 require optee.inc
> > > > -DEPENDS =3D "optee-client optee-os-tadevkit python3-pycryptodome-native"
> > > > +DEPENDS =3D "optee-client optee-os-tadevkit python3-pycryptodome-native python3-cryptography-native"
> > > >=C2=A0=C2=A0 SRC_URI =3D "git://github.com/OP-TEE/optee_test.git;branch=3Dmaster;pro= tocol=3Dhttps \
> > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 file:/= /run-ptest=C2=A0 \
> > > > diff --git a/meta-arm/recipes-security/optee/optee-test_3.14.0.bb b/meta-arm/recipes-security/optee/optee-test_3.14.0.bb
> > > > deleted file mode 100644
> > > > index 6367c27..0000000
> > > > --- a/meta-arm/recipes-security/optee/optee-test_3.14.0.bb
> > > > +++ /dev/null
> > > > @@ -1,3 +0,0 @@
> > > > -require optee-test.inc
> > > > -
> > > > -SRCREV =3D "f2eb88affbb7f028561b4fd5cbd049d5d704f741"
> > > > diff --git a/meta-arm/recipes-security/optee/optee-test_3.16.0.bb b/meta-arm/recipes-security/optee/optee-test_3.16.0.bb
> > > > new file mode 100644
> > > > index 0000000..03f9c34
> > > > --- /dev/null
> > > > +++ b/meta-arm/recipes-security/optee/optee-test_3.16.0.bb
> > > > @@ -0,0 +1,3 @@
> > > > +require optee-test.inc
> > > > +
> > > > +SRCREV =3D "1cf0e6d2bdd1145370033d4e182634458528579d"
> > > > diff --git a/meta-arm/recipes-security/optee/optee.inc b/meta-arm/recipes-security/optee/optee.inc
> > > > index f02a022..beae366 100644
> > > > --- a/meta-arm/recipes-security/optee/optee.inc
> > > > +++ b/meta-arm/recipes-security/optee/optee.inc
> > > > @@ -26,3 +26,6 @@ EXTRA_OEMAKE +=3D "V=3D= 1 \
> > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 OPTEE_CLIENT_EXPORT=3D${STAGING_DIR_HOST}${prefix} \
> > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 TEEC_EXPORT=3D${STAGING_DIR_HOST}${prefix} \
> > > >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "
> > > > +# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
> > > > +# right path until this is relocated automatically.
> > > > +export OPENSSL_MODULES=3D"${STAGING_LIBDIR_NATIVE}/ossl-modules" > > > > --
> > > > 2.25.1
> > > >
> > > >
> > > >
> > > >
> > > >

-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-
Links: You receive all messages sent to this group.
View/Reply Online (#3096): https://lists.yoctop=
roject.org/g/meta-arm/message/3096
Mute This Topic: https://lists.yoctoproject.org/mt/=
89404067/4354175
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm=
/unsub [alhe@linux.microsoft.com]
-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-
--------------0FUxJR3lZLhIbe82myS8c0OG--