From 55ae0eb1a6c210e6e87f5a553a1ebbb7dcc7a725 Mon Sep 17 00:00:00 2001 From: "Arpita S.K" Date: Fri, 29 Oct 2021 12:27:53 +0100 Subject: [PATCH] arm/trusted-firmware-a,fiptool-native: Fix fiptool execution wrt corstone1000 After http://git.yoctoproject.org/cgit/cgit.cgi/meta-arm/commit/?id=648571b113b39420735859461fcd69cfc6f66c76, building the corstone1000-image fails with the below error. fiptool_platform.h:19:11: fatal error: openssl/sha.h: No such file or directory # include Put back the inclusion of BUILD_LDFLAGS to fix this. Change-Id: I57396eefe2c9a58e4c5c6a751b2ee7d32509cac5 Signed-off-by: Arpita S.K Signed-off-by: Jon Mason --- meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 1 + meta-arm/recipes-devtools/fiptool/fiptool-native_2.5.bb | 1 + 2 files changed, 2 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 3c4cd58f..0d49a0a2 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 @@ -155,6 +155,7 @@ 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 + sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${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 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 9ad1166f..dd36eca8 100644 --- a/meta-arm/recipes-devtools/fiptool/fiptool-native_2.5.bb +++ b/meta-arm/recipes-devtools/fiptool/fiptool-native_2.5.bb @@ -22,6 +22,7 @@ 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 + sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile oe_runmake fiptool }