[openwrt/openwrt] uboot-imx: fix wrong make flags overriding

LEDE Commits lede-commits at lists.infradead.org
Sat May 28 05:32:59 PDT 2022


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/481339a0426698adaa0254b479807efde0428de9

commit 481339a0426698adaa0254b479807efde0428de9
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Sat May 28 14:18:06 2022 +0200

    uboot-imx: fix wrong make flags overriding
    
    Buidbots are currently choking on the following compile error:
    
     In file included from tools/aisimage.c:9:
     include/image.h:1133:12: fatal error: openssl/evp.h: No such file or directory
      #  include <openssl/evp.h>
                 ^~~~~~~~~~~~~~~
     compilation terminated.
    
    This is caused by a complete overriding of make flags which are provided
    correctly in `UBOOT_MAKE_FLAGS` variable, but currently overriden
    instead of extended. This then leads to the usage of build host include
    dirs, which are not available.
    
    Fix it by extending `UBOOT_MAKE_FLAGS` variable in all device recipes.
    
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 package/boot/uboot-imx/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/boot/uboot-imx/Makefile b/package/boot/uboot-imx/Makefile
index 63f145798d..305d127557 100644
--- a/package/boot/uboot-imx/Makefile
+++ b/package/boot/uboot-imx/Makefile
@@ -23,7 +23,7 @@ endef
 define U-Boot/apalis_imx6
   NAME:=Toradex Apalis
   UBOOT_IMAGE:=SPL u-boot.img u-boot-with-spl.imx
-  UBOOT_MAKE_FLAGS:=SPL u-boot.img u-boot-with-spl.imx
+  UBOOT_MAKE_FLAGS+=SPL u-boot.img u-boot-with-spl.imx
   BUILD_SUBTARGET:=cortexa9
   BUILD_DEVICES:=toradex_apalis
 endef
@@ -31,7 +31,7 @@ endef
 define U-Boot/mx6cuboxi
   NAME:=SolidRun Cubox-i boards
   UBOOT_IMAGE:=SPL u-boot-dtb.img
-  UBOOT_MAKE_FLAGS:=SPL u-boot-dtb.img
+  UBOOT_MAKE_FLAGS+=SPL u-boot-dtb.img
   BUILD_SUBTARGET:=cortexa9
   BUILD_DEVICES:=solidrun_cubox-i
 endef




More information about the lede-commits mailing list