From a01f272149379085845e798dc46d31f680d7431d Mon Sep 17 00:00:00 2001 From: Alexander Sverdlin Date: Wed, 28 Feb 2024 17:09:17 +0100 Subject: [PATCH] optee-ftpm: fix EARLY_TA_PATHS passed to optee-os Fix the build with DISTRO_FEATURES containing "usrmerge": make: *** No rule to make target '/.../optee-os/4.1.0/recipe-sysroot/lib/optee_armtz/bc50d971-d4c9-42c4-82cb-343fb7f37896.stripped.elf', needed by '/.../optee-os/4.1.0/build/core/early_ta_bc50d971-d4c9-42c4-82cb-343fb7f37896.c'. Stop. Fixes: 6a105f47b920 ("optee-ftpm: Install artifacts into nonarch_base_libdir") Signed-off-by: Alexander Sverdlin Signed-off-by: Jon Mason --- meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend index 40423615..4829bc10 100644 --- a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend +++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend @@ -10,6 +10,6 @@ DEPENDS:append = "\ EXTRA_OEMAKE:append = "\ ${@bb.utils.contains('MACHINE_FEATURES', \ 'optee-ftpm', \ - 'CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/lib/optee_armtz/${FTPM_UUID}.stripped.elf"', \ + 'CFG_EARLY_TA=y EARLY_TA_PATHS="${STAGING_DIR_TARGET}/${base_libdir}/optee_armtz/${FTPM_UUID}.stripped.elf"', \ '', \ d)} "