| Message ID | 20211115140100.24634-1-maxim.uvarov@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [PATCHv3,1/5] optee: updae optee-os.inc to support external TAs | expand |
CI is still running, but it is already failing check-layers (again) with ERROR: Nothing PROVIDES 'optee-os-tadevkit' (but /builds/jonmason00/meta-arm/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb DEPENDS on or otherwise requires it) See https://gitlab.com/jonmason00/meta-arm/-/jobs/1783827221 Thanks, Jon On Mon, Nov 15, 2021 at 05:00:56PM +0300, Maxim Uvarov wrote: > Separate recipe for TA devkit is needed to solve > circular dependency to build TAs withthe devkit > and integrate it inside optee-os. > > Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> > --- > .../recipes-security/optee/optee-examples.inc | 2 +- > .../optee/optee-os-tadevkit_3.14.0.bb | 20 +++++++++++++++++++ > meta-arm/recipes-security/optee/optee-os.inc | 7 ------- > 3 files changed, 21 insertions(+), 8 deletions(-) > create mode 100644 meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb > > diff --git a/meta-arm/recipes-security/optee/optee-examples.inc b/meta-arm/recipes-security/optee/optee-examples.inc > index 921fa18..656722e 100644 > --- a/meta-arm/recipes-security/optee/optee-examples.inc > +++ b/meta-arm/recipes-security/optee/optee-examples.inc > @@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/linaro-swg/optee_examples" > LICENSE = "BSD-2-Clause" > LIC_FILES_CHKSUM = "file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30" > > -DEPENDS = "optee-client optee-os python3-pycryptodome-native" > +DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native" > > inherit python3native > > 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.14.0.bb > new file mode 100644 > index 0000000..0d37a52 > --- /dev/null > +++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb > @@ -0,0 +1,20 @@ > +FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:" > +require optee-os_3.14.0.bb > + > +SUMMARY = "OP-TEE Trusted OS TA devkit" > +DESCRIPTION = "OP-TEE TA devkit for build TAs" > +HOMEPAGE = "https://www.op-tee.org/" > + > +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/" > diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc > index 277646e..1506a58 100644 > --- a/meta-arm/recipes-security/optee/optee-os.inc > +++ b/meta-arm/recipes-security/optee/optee-os.inc > @@ -46,12 +46,6 @@ do_install() { > #install core in firmware > install -d ${D}${nonarch_base_libdir}/firmware/ > install -m 644 ${B}/core/*.bin ${B}/core/tee.elf ${D}${nonarch_base_libdir}/firmware/ > - > - #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 > } > > PACKAGE_ARCH = "${MACHINE_ARCH}" > @@ -66,7 +60,6 @@ addtask deploy before do_build after do_install > SYSROOT_DIRS += "${nonarch_base_libdir}/firmware" > > FILES:${PN} = "${nonarch_base_libdir}/firmware/" > -FILES:${PN}-dev = "${includedir}/optee/" > > # note: "textrel" is not triggered on all archs > INSANE_SKIP:${PN} = "textrel" > -- > 2.17.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#2391): https://lists.yoctoproject.org/g/meta-arm/message/2391 > Mute This Topic: https://lists.yoctoproject.org/mt/87069528/3616920 > Group Owner: meta-arm+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [jdmason@kudzu.us] > -=-=-=-=-=-=-=-=-=-=-=- >
On Mon, Nov 15, 2021 at 11:47:17AM -0500, Jon Mason via lists.yoctoproject.org wrote: > CI is still running, but it is already failing check-layers (again) with > ERROR: Nothing PROVIDES 'optee-os-tadevkit' (but /builds/jonmason00/meta-arm/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb DEPENDS on or otherwise requires it) > See https://gitlab.com/jonmason00/meta-arm/-/jobs/1783827221 Looks like it's not clang safe either https://gitlab.com/jonmason00/meta-arm/-/jobs/1783827269 > > Thanks, > Jon > > On Mon, Nov 15, 2021 at 05:00:56PM +0300, Maxim Uvarov wrote: > > Separate recipe for TA devkit is needed to solve > > circular dependency to build TAs withthe devkit > > and integrate it inside optee-os. > > > > Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> > > --- > > .../recipes-security/optee/optee-examples.inc | 2 +- > > .../optee/optee-os-tadevkit_3.14.0.bb | 20 +++++++++++++++++++ > > meta-arm/recipes-security/optee/optee-os.inc | 7 ------- > > 3 files changed, 21 insertions(+), 8 deletions(-) > > create mode 100644 meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb > > > > diff --git a/meta-arm/recipes-security/optee/optee-examples.inc b/meta-arm/recipes-security/optee/optee-examples.inc > > index 921fa18..656722e 100644 > > --- a/meta-arm/recipes-security/optee/optee-examples.inc > > +++ b/meta-arm/recipes-security/optee/optee-examples.inc > > @@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/linaro-swg/optee_examples" > > LICENSE = "BSD-2-Clause" > > LIC_FILES_CHKSUM = "file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30" > > > > -DEPENDS = "optee-client optee-os python3-pycryptodome-native" > > +DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native" > > > > inherit python3native > > > > 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.14.0.bb > > new file mode 100644 > > index 0000000..0d37a52 > > --- /dev/null > > +++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb > > @@ -0,0 +1,20 @@ > > +FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:" > > +require optee-os_3.14.0.bb > > + > > +SUMMARY = "OP-TEE Trusted OS TA devkit" > > +DESCRIPTION = "OP-TEE TA devkit for build TAs" > > +HOMEPAGE = "https://www.op-tee.org/" > > + > > +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/" > > diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc > > index 277646e..1506a58 100644 > > --- a/meta-arm/recipes-security/optee/optee-os.inc > > +++ b/meta-arm/recipes-security/optee/optee-os.inc > > @@ -46,12 +46,6 @@ do_install() { > > #install core in firmware > > install -d ${D}${nonarch_base_libdir}/firmware/ > > install -m 644 ${B}/core/*.bin ${B}/core/tee.elf ${D}${nonarch_base_libdir}/firmware/ > > - > > - #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 > > } > > > > PACKAGE_ARCH = "${MACHINE_ARCH}" > > @@ -66,7 +60,6 @@ addtask deploy before do_build after do_install > > SYSROOT_DIRS += "${nonarch_base_libdir}/firmware" > > > > FILES:${PN} = "${nonarch_base_libdir}/firmware/" > > -FILES:${PN}-dev = "${includedir}/optee/" > > > > # note: "textrel" is not triggered on all archs > > INSANE_SKIP:${PN} = "textrel" > > -- > > 2.17.1 > > > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#2397): https://lists.yoctoproject.org/g/meta-arm/message/2397 > Mute This Topic: https://lists.yoctoproject.org/mt/87069528/3616920 > Group Owner: meta-arm+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [jdmason@kudzu.us] > -=-=-=-=-=-=-=-=-=-=-=- >
On Mon, 15 Nov 2021 at 22:05, Jon Mason <jdmason@kudzu.us> wrote: > > On Mon, Nov 15, 2021 at 11:47:17AM -0500, Jon Mason via lists.yoctoproject.org wrote: > > CI is still running, but it is already failing check-layers (again) with > > ERROR: Nothing PROVIDES 'optee-os-tadevkit' (but /builds/jonmason00/meta-arm/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb DEPENDS on or otherwise requires it) > > See https://gitlab.com/jonmason00/meta-arm/-/jobs/1783827221 > > Looks like it's not clang safe either > https://gitlab.com/jonmason00/meta-arm/-/jobs/1783827269 > From log above error is: | /bin/sh: 1: aarch64-poky-linux-gcc: not found Interesting how I can reproduce it... BR, Maxim. > > > > Thanks, > > Jon > > > > On Mon, Nov 15, 2021 at 05:00:56PM +0300, Maxim Uvarov wrote: > > > Separate recipe for TA devkit is needed to solve > > > circular dependency to build TAs withthe devkit > > > and integrate it inside optee-os. > > > > > > Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> > > > --- > > > .../recipes-security/optee/optee-examples.inc | 2 +- > > > .../optee/optee-os-tadevkit_3.14.0.bb | 20 +++++++++++++++++++ > > > meta-arm/recipes-security/optee/optee-os.inc | 7 ------- > > > 3 files changed, 21 insertions(+), 8 deletions(-) > > > create mode 100644 meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb > > > > > > diff --git a/meta-arm/recipes-security/optee/optee-examples.inc b/meta-arm/recipes-security/optee/optee-examples.inc > > > index 921fa18..656722e 100644 > > > --- a/meta-arm/recipes-security/optee/optee-examples.inc > > > +++ b/meta-arm/recipes-security/optee/optee-examples.inc > > > @@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/linaro-swg/optee_examples" > > > LICENSE = "BSD-2-Clause" > > > LIC_FILES_CHKSUM = "file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30" > > > > > > -DEPENDS = "optee-client optee-os python3-pycryptodome-native" > > > +DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native" > > > > > > inherit python3native > > > > > > 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.14.0.bb > > > new file mode 100644 > > > index 0000000..0d37a52 > > > --- /dev/null > > > +++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb > > > @@ -0,0 +1,20 @@ > > > +FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:" > > > +require optee-os_3.14.0.bb > > > + > > > +SUMMARY = "OP-TEE Trusted OS TA devkit" > > > +DESCRIPTION = "OP-TEE TA devkit for build TAs" > > > +HOMEPAGE = "https://www.op-tee.org/" > > > + > > > +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/" > > > diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc > > > index 277646e..1506a58 100644 > > > --- a/meta-arm/recipes-security/optee/optee-os.inc > > > +++ b/meta-arm/recipes-security/optee/optee-os.inc > > > @@ -46,12 +46,6 @@ do_install() { > > > #install core in firmware > > > install -d ${D}${nonarch_base_libdir}/firmware/ > > > install -m 644 ${B}/core/*.bin ${B}/core/tee.elf ${D}${nonarch_base_libdir}/firmware/ > > > - > > > - #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 > > > } > > > > > > PACKAGE_ARCH = "${MACHINE_ARCH}" > > > @@ -66,7 +60,6 @@ addtask deploy before do_build after do_install > > > SYSROOT_DIRS += "${nonarch_base_libdir}/firmware" > > > > > > FILES:${PN} = "${nonarch_base_libdir}/firmware/" > > > -FILES:${PN}-dev = "${includedir}/optee/" > > > > > > # note: "textrel" is not triggered on all archs > > > INSANE_SKIP:${PN} = "textrel" > > > -- > > > 2.17.1 > > > > > > > > > > > > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#2397): https://lists.yoctoproject.org/g/meta-arm/message/2397 > > Mute This Topic: https://lists.yoctoproject.org/mt/87069528/3616920 > > Group Owner: meta-arm+owner@lists.yoctoproject.org > > Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [jdmason@kudzu.us] > > -=-=-=-=-=-=-=-=-=-=-=- > > >
diff --git a/meta-arm/recipes-security/optee/optee-examples.inc b/meta-arm/recipes-security/optee/optee-examples.inc index 921fa18..656722e 100644 --- a/meta-arm/recipes-security/optee/optee-examples.inc +++ b/meta-arm/recipes-security/optee/optee-examples.inc @@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/linaro-swg/optee_examples" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30" -DEPENDS = "optee-client optee-os python3-pycryptodome-native" +DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native" inherit python3native 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.14.0.bb new file mode 100644 index 0000000..0d37a52 --- /dev/null +++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb @@ -0,0 +1,20 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:" +require optee-os_3.14.0.bb + +SUMMARY = "OP-TEE Trusted OS TA devkit" +DESCRIPTION = "OP-TEE TA devkit for build TAs" +HOMEPAGE = "https://www.op-tee.org/" + +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/" diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc index 277646e..1506a58 100644 --- a/meta-arm/recipes-security/optee/optee-os.inc +++ b/meta-arm/recipes-security/optee/optee-os.inc @@ -46,12 +46,6 @@ do_install() { #install core in firmware install -d ${D}${nonarch_base_libdir}/firmware/ install -m 644 ${B}/core/*.bin ${B}/core/tee.elf ${D}${nonarch_base_libdir}/firmware/ - - #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 } PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -66,7 +60,6 @@ addtask deploy before do_build after do_install SYSROOT_DIRS += "${nonarch_base_libdir}/firmware" FILES:${PN} = "${nonarch_base_libdir}/firmware/" -FILES:${PN}-dev = "${includedir}/optee/" # note: "textrel" is not triggered on all archs INSANE_SKIP:${PN} = "textrel"
Separate recipe for TA devkit is needed to solve circular dependency to build TAs withthe devkit and integrate it inside optee-os. Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> --- .../recipes-security/optee/optee-examples.inc | 2 +- .../optee/optee-os-tadevkit_3.14.0.bb | 20 +++++++++++++++++++ meta-arm/recipes-security/optee/optee-os.inc | 7 ------- 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb