diff mbox series

[v2] optee-ftpm: fix EARLY_TA_PATHS passed to optee-os

Message ID 20240229071922.76043-1-alexander.sverdlin@siemens.com
State New
Headers show
Series [v2] optee-ftpm: fix EARLY_TA_PATHS passed to optee-os | expand

Commit Message

Sverdlin, Alexander Feb. 29, 2024, 7:19 a.m. UTC 
From: Alexander Sverdlin <alexander.sverdlin@siemens.com>

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 <alexander.sverdlin@siemens.com>
---
Changes in v2:
base_libdir -> nonarch_base_libdir

 meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Khem Raj Feb. 29, 2024, 7:29 a.m. UTC | #1 
lgtm

On Wed, Feb 28, 2024 at 11:19 PM A. Sverdlin
<alexander.sverdlin@siemens.com> wrote:
>
> From: Alexander Sverdlin <alexander.sverdlin@siemens.com>
>
> 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 <alexander.sverdlin@siemens.com>
> ---
> Changes in v2:
> base_libdir -> nonarch_base_libdir
>
>  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}/${nonarch_base_libdir}/optee_armtz/${FTPM_UUID}.stripped.elf"', \
>                        '', \
>                        d)} "
> --
> 2.43.2
>
Jon Mason March 13, 2024, 1:37 p.m. UTC | #2 
On Thu, 29 Feb 2024 08:19:16 +0100, A. Sverdlin wrote:
> 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.
> 
> 

Applied, thanks!

[1/1] optee-ftpm: fix EARLY_TA_PATHS passed to optee-os
      commit: a01f272149379085845e798dc46d31f680d7431d

Best regards,
diff mbox series

Patch

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}/${nonarch_base_libdir}/optee_armtz/${FTPM_UUID}.stripped.elf"', \
                       '', \
                       d)} "