From 1597b866f8d4725fc8aa96a4adddfe49dbac297c Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Wed, 27 Oct 2021 15:11:32 +0100 Subject: [PATCH] arm/trusted-firmware-a,fiptool-native: Fix fiptool execution After http://git.yoctoproject.org/cgit/cgit.cgi/meta-arm/commit/?id=648571b113b39420735859461fcd69cfc6f66c76 the fiptool create command fails with: tools/fiptool/fiptool: error while loading shared libraries: libcrypto.so.3: cannot open shared object file: No such file or directory Put back the inclusion of BUILD_LDFLAGS to fix this. Issue-Id: SCM-3548 Signed-off-by: Diego Sueiro Change-Id: I8bfddd0528d5c4dbf5dfd87c9ae17db4e0071b1c Signed-off-by: Jon Mason --- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 4 ++++ meta-arm/recipes-devtools/fiptool/fiptool-native_2.5.bb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 36bd0376..3c4cd58f 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc @@ -152,6 +152,10 @@ BUILD_DIR .= "${@'/${TFA_BOARD}' if d.getVar('TFA_BOARD') else ''}" BUILD_DIR .= "/${@'debug' if d.getVar("TFA_DEBUG") == '1' else 'release'}" do_compile() { + # This is still needed to have the native fiptool executing properly by + # setting the RPATH + sed -i '/^LDLIBS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile + # Currently there are races if you build all the targets at once in parallel for T in ${TFA_BUILD_TARGET}; do oe_runmake -C ${S} $T diff --git a/meta-arm/recipes-devtools/fiptool/fiptool-native_2.5.bb b/meta-arm/recipes-devtools/fiptool/fiptool-native_2.5.bb index e733ff1e..9ad1166f 100644 --- a/meta-arm/recipes-devtools/fiptool/fiptool-native_2.5.bb +++ b/meta-arm/recipes-devtools/fiptool/fiptool-native_2.5.bb @@ -19,6 +19,10 @@ inherit native EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}" do_compile () { + # This is still needed to have the native fiptool executing properly by + # setting the RPATH + sed -i '/^LDLIBS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile + oe_runmake fiptool }