tools/mkimage: update to 2023.04

[openwrt/staging/nbd.git] / tools / mkimage / Makefile

diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index 49eb26184d81daffe698086e35b2f46106b5ca65..a6d54f5eff2ae493255b08aec219e48531f4df8b 100644 (file)
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -7,39 +7,47 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mkimage
-PKG_VERSION:=2014.07
+PKG_VERSION:=2023.04
 
 PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=36d4bad687edcafa396fee607e505d4e
-PKG_CAT:=bzcat
+PKG_SOURCE_URL:= \
+       https://mirror.cyberbits.eu/u-boot \
+       https://ftp.denx.de/pub/u-boot \
+       ftp://ftp.denx.de/pub/u-boot
+PKG_HASH:=e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Host/Prepare
-       $(Host/Prepare/Default)
-       rm -f \
-               $(HOST_BUILD_DIR)/include/errno.h \
-               $(HOST_BUILD_DIR)/include/malloc.h \
-               $(HOST_BUILD_DIR)/tools/.depend
-       touch $(HOST_BUILD_DIR)/include/config.mk
-       touch $(HOST_BUILD_DIR)/include/config.h
+define Host/Configure
+       $(MAKE) -C $(HOST_BUILD_DIR) \
+               HOSTCFLAGS="$(HOST_CFLAGS)" \
+               HOSTLDFLAGS="$(HOST_LDFLAGS)" \
+               PKG_CONFIG_EXTRAARGS="--static" \
+               V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1) \
+               tools-only_config
+
+       sed -i 's/CONFIG_TOOLS_MKEFICAPSULE=y/# CONFIG_TOOLS_MKEFICAPSULE is not set/' $(HOST_BUILD_DIR)/.config
 endef
 
 define Host/Compile
        $(MAKE) -C $(HOST_BUILD_DIR) \
-               HOSTLDFLAGS="$(HOST_STATIC_LINKING)" \
+               HOSTCFLAGS="$(HOST_CFLAGS)" \
+               HOSTLDFLAGS="$(HOST_LDFLAGS)" \
+               PKG_CONFIG_EXTRAARGS="--static" \
+               V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1) \
                tools-only
 endef
 
 define Host/Install
        $(CP) $(HOST_BUILD_DIR)/tools/mkimage $(STAGING_DIR_HOST)/bin/
+       $(CP) $(HOST_BUILD_DIR)/tools/mkenvimage $(STAGING_DIR_HOST)/bin/
 endef
 
 define Host/Clean
        rm -f $(STAGING_DIR_HOST)/bin/mkimage
+       rm -f $(STAGING_DIR_HOST)/bin/mkenvimage
 endef
 
 $(eval $(call HostBuild))