tools/mkimage: update to 2023.04

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

diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index 00f85ae27263a22ec226cd6a89b3f983f88d19d9..a6d54f5eff2ae493255b08aec219e48531f4df8b 100644 (file)
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -7,32 +7,37 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mkimage
-PKG_VERSION:=2014.10
+PKG_VERSION:=2023.04
 
 PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=\
-       http://mirror2.openwrt.org/sources \
+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:=d3b132a7a9b3f3182b7aad71c2dfbd4fc15bea83e12c76134eb3ffefc07d1c71
-PKG_CAT:=bzcat
+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) defconfig   HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" HOSTLDFLAGS="$(HOST_LDFLAGS)" HOST_LOADLIBES="$$$$(pkg-config --static --libs libcrypto)"
-       $(MAKE) -C $(HOST_BUILD_DIR) tools-only  HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" HOSTLDFLAGS="$(HOST_LDFLAGS)" HOST_LOADLIBES="$$$$(pkg-config --static --libs libcrypto)"
+       $(MAKE) -C $(HOST_BUILD_DIR) \
+               HOSTCFLAGS="$(HOST_CFLAGS)" \
+               HOSTLDFLAGS="$(HOST_LDFLAGS)" \
+               PKG_CONFIG_EXTRAARGS="--static" \
+               V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1) \
+               tools-only
 endef
 
 define Host/Install