From ade09d3a60219f543d37b5fc2a2253105db89931 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 9 Sep 2026 19:03:41 +0100 Subject: [PATCH] arm/fiptool: fix native linkage The Makefiles in TF-A have changed since this recipe was last altered, and our BUILD_LDFLAGS are no longer being respected. This means the built objects don't have the correct RPATH, so they fail to run if the host doesn't have libcrypto.so.4 (from OpenSSL 4) installed. Pass all of our BUILD_* flags via HOSTCC*, and delete the now redundant sed operations. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .../trusted-firmware-a/fiptool-native_2.15.0.bb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.15.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.15.0.bb index 11e54fbf..8292eefc 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.15.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.15.0.bb @@ -17,14 +17,13 @@ DEPENDS += "openssl-native" inherit native -EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}" +EXTRA_OEMAKE = "V=1 \ + HOSTCC='${BUILD_CC}' \ + HOSTCCFLAGS='${BUILD_CPPFLAGS} ${BUILD_CFLAGS}' \ + HOSTLDFLAGS='${BUILD_LDFLAGS}' \ + 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 '/^LDOPTS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile - sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile - oe_runmake fiptool }