package/uboot-tools: concat files before passing to env image tool

Fix BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE so that files are actually concatenated
as described in the help text.

Signed-off-by: Mirza Kapetanovic <mirza.kapetanovic@gmail.com>
Reviewed-by: Matthew Weber <matthew.weber@collins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index b378ab65f47489426e3cc86307ae5a68a1b21fea..a87956d0283a365540773d6310485250fe9d9f2e 100644 (file)
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -156,11 +156,12 @@ endif #BR_BUILDING
 
 define HOST_UBOOT_TOOLS_GENERATE_ENVIMAGE
        $(HOST_UBOOT_TOOLS_GENERATE_ENV_DEFAULTS)
-       $(@D)/tools/mkenvimage -s $(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE) \
+       cat $(UBOOT_TOOLS_GENERATE_ENV_FILE) | \
+               $(@D)/tools/mkenvimage -s $(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE) \
                $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_REDUNDANT),-r) \
                $(if $(filter "BIG",$(BR2_ENDIAN)),-b) \
                -o $(@D)/tools/uboot-env.bin \
-               $(UBOOT_TOOLS_GENERATE_ENV_FILE)
+               -
 endef
 define HOST_UBOOT_TOOLS_INSTALL_ENVIMAGE
        $(INSTALL) -m 0755 -D $(@D)/tools/uboot-env.bin $(BINARIES_DIR)/uboot-env.bin