@@ -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}"
@@ -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)} "
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(-)