[PATCH] arm/optee-os: Fix build race condition when using fTPM

[PATCH] arm/optee-os: Fix build race condition when using fTPM

[Ryan Fairfax]

[-- Attachment #1: Type: text/plain, Size: 1340 bytes --]

Update dependencies to depend on optee-ftpm:do_deploy instead of do_populate_sysroot since binaries are being referenced from DEPLOY_DIR_IMAGE.

Signed-off-by: Ryan Fairfax <rfairfax@microsoft.com>
---
.../recipes-security/optee-ftpm/optee-os_%.bbappend  | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
index 0cfa949..6e2edce 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
+++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
@@ -1,11 +1,11 @@
FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896"

-DEPENDS:append = "\
-                  ${@bb.utils.contains('MACHINE_FEATURES', \
-                 'optee-ftpm', \
-                 'optee-ftpm', \
-                 '' , \
-                 d)}"
+do_compile[depends] += "\
+                       ${@bb.utils.contains('MACHINE_FEATURES', \
+                      'optee-ftpm', \
+                      'optee-ftpm:do_deploy', \
+                      '' , \
+                      d)}"

EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', \
'optee-ftpm', \
--
2.25.1

[-- Attachment #2: Type: text/html, Size: 2257 bytes --]

Re: [meta-arm] [PATCH] arm/optee-os: Fix build race condition when using fTPM

[Ross Burton]

On Tue, 11 Jan 2022 at 00:07, Ryan Fairfax via lists.yoctoproject.org
<rfairfax=microsoft.com@lists.yoctoproject.org> wrote:
> Update dependencies to depend on optee-ftpm:do_deploy instead of do_populate_sysroot since binaries are being referenced from DEPLOY_DIR_IMAGE.

The typical approach here is for packages to also write into staging,
so files can be pulled out of the sysroot instead of deploydir.

eg optee-os does SYSROOT_DIRS += "${nonarch_base_libdir}/firmware" so
that the files are in the sysroot to be shared.

The better question is why this doesn't fail in our CI.   Do you know
why this doesn't break our qemuarm64-secureboot build which does
enable optee-ftpm?

Ross