diff options
author | Daniel Golle <daniel@makrotopia.org> | 2022-08-05 14:06:22 +0200 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-08-11 17:11:54 +0200 |
commit | fa9895ee5bae9fa91b18b7a8e06bc63374b0a2a0 (patch) | |
tree | 125adc441528b1c2b1f24032490a6c837a118e6f /tools/mkimage/Makefile | |
parent | 87e09b692bd8537abbb1c691cec8c642594a9141 (diff) | |
download | upstream-fa9895ee5bae9fa91b18b7a8e06bc63374b0a2a0.tar.gz upstream-fa9895ee5bae9fa91b18b7a8e06bc63374b0a2a0.tar.bz2 upstream-fa9895ee5bae9fa91b18b7a8e06bc63374b0a2a0.zip |
tools: mkimage: update to U-Boot release 2022.07
Removed patch 090-macos-arm64-builing-fix.patch as an equivalent
solution was applied upstream:
3b142045e8 Support building on macOS/arm64
To not add new host dependencies (libuuid, gnuTLS) don't build the
anyway unused mkeficapsule tool which would otherwise now be built
by default.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'tools/mkimage/Makefile')
-rw-r--r-- | tools/mkimage/Makefile | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile index fd5dad0cd8..a7c98e755e 100644 --- a/tools/mkimage/Makefile +++ b/tools/mkimage/Makefile @@ -7,26 +7,36 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mkimage -PKG_VERSION:=2022.01 +PKG_VERSION:=2022.07 PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2 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:=81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 +PKG_HASH:=92b08eb49c24da14c1adbf70a71ae8f37cc53eeb4230e859ad8b6733d13dcf5e HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION) include $(INCLUDE_DIR)/host-build.mk +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) \ HOSTCFLAGS="$(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS)" \ PKG_CONFIG_EXTRAARGS="--static" \ V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1) \ - tools-only_config \ tools-only endef |