From 940b9afdde87e8f8e45e0510081ea30550618d90 Mon Sep 17 00:00:00 2001
From: Ryan Fairfax <rfairfax@microsoft.com>
Date: Fri, 14 Jan 2022 11:09:05 -0800
Subject: [PATCH] arm/optee-os: Fix build race condition when building fTPM

Change ftpm to install embeddable (stripped) version to sysroot.  When
building optee-os pick up from sysroot instead of DEPLOY_DIR_IMAGE.
This fixes a build race condition where DEPENDS was only waiting for
optee-ftpm:do_populate_sysroot instead of do_deploy.

Signed-off-by: Ryan Fairfax <rfairfax@microsoft.com>
---
 meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb   | 6 +++++-
 meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

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 e30e13a4..f2a74da3 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
+++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
@@ -60,6 +60,7 @@ do_compile() {
 do_install () {
     mkdir -p ${D}/lib/optee_armtz
     install -D -p -m 0644 ${S}/TAs/optee_ta/out/fTPM/${FTPM_UUID}.ta ${D}/lib/optee_armtz/
+    install -D -p -m 0644 ${S}/TAs/optee_ta/out/fTPM/${FTPM_UUID}.stripped.elf ${D}/lib/optee_armtz/
 }
 
 do_deploy () {
@@ -69,7 +70,10 @@ do_deploy () {
 
 addtask deploy before do_build after do_install
 
-FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/${FTPM_UUID}.ta"
+FILES:${PN} += " \
+               ${nonarch_base_libdir}/optee_armtz/${FTPM_UUID}.ta \
+               ${nonarch_base_libdir}/optee_armtz/${FTPM_UUID}.stripped.elf \
+               "
 
 # Imports machine specific configs from staging to build
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
index 0cfa949b..acea7502 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
+++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend
@@ -9,6 +9,6 @@ DEPENDS:append = "\
 
 EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', \
                       'optee-ftpm', \
-                      'CFG_EARLY_TA=y EARLY_TA_PATHS="${DEPLOY_DIR_IMAGE}/optee/${FTPM_UUID}.stripped.elf"', \
+                      'CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', \
                       '', \
                       d)} "