tools/mkimage: update to 2022.01
- enable dot config - enable openwrt verbose - add bison as dependency to avoid failure ``` bison -oscripts/kconfig/zconf.tab.c -t -l scripts/kconfig/zconf.y bison: /builder/shared-workdir/build/staging_dir/host/share/bison/m4sugar/m4sugar.m4: cannot open: No such file or directory ``` Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
This commit is contained in:
parent
40f91f6a2f
commit
4a19cf3bc7
@ -62,7 +62,7 @@ $(curdir)/llvm-bpf/compile := $(curdir)/cmake/compile
|
|||||||
$(curdir)/make-ext4fs/compile := $(curdir)/zlib/compile
|
$(curdir)/make-ext4fs/compile := $(curdir)/zlib/compile
|
||||||
$(curdir)/meson/compile := $(curdir)/ninja/compile
|
$(curdir)/meson/compile := $(curdir)/ninja/compile
|
||||||
$(curdir)/missing-macros/compile := $(curdir)/autoconf/compile
|
$(curdir)/missing-macros/compile := $(curdir)/autoconf/compile
|
||||||
$(curdir)/mkimage/compile += $(curdir)/libressl/compile
|
$(curdir)/mkimage/compile += $(curdir)/bison/compile $(curdir)/libressl/compile
|
||||||
$(curdir)/mklibs/compile := $(curdir)/libtool/compile
|
$(curdir)/mklibs/compile := $(curdir)/libtool/compile
|
||||||
$(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile
|
$(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile
|
||||||
$(curdir)/mpfr/compile := $(curdir)/gmp/compile
|
$(curdir)/mpfr/compile := $(curdir)/gmp/compile
|
||||||
|
@ -7,38 +7,26 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=mkimage
|
PKG_NAME:=mkimage
|
||||||
PKG_VERSION:=2021.10
|
PKG_VERSION:=2022.01
|
||||||
|
|
||||||
PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2
|
||||||
PKG_SOURCE_URL:= \
|
PKG_SOURCE_URL:= \
|
||||||
https://mirror.cyberbits.eu/u-boot \
|
https://mirror.cyberbits.eu/u-boot \
|
||||||
https://ftp.denx.de/pub/u-boot \
|
https://ftp.denx.de/pub/u-boot \
|
||||||
ftp://ftp.denx.de/pub/u-boot
|
ftp://ftp.denx.de/pub/u-boot
|
||||||
PKG_HASH:=cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4
|
PKG_HASH:=81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413
|
||||||
|
|
||||||
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
|
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION)
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/host-build.mk
|
include $(INCLUDE_DIR)/host-build.mk
|
||||||
|
|
||||||
define Host/Prepare
|
|
||||||
$(Host/Prepare/Default)
|
|
||||||
mkdir -p $(HOST_BUILD_DIR)/include/config
|
|
||||||
touch $(HOST_BUILD_DIR)/include/config/auto.conf
|
|
||||||
mkdir -p $(HOST_BUILD_DIR)/include/generated/
|
|
||||||
touch $(HOST_BUILD_DIR)/include/generated/autoconf.h
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Host/Compile
|
define Host/Compile
|
||||||
$(MAKE) -C $(HOST_BUILD_DIR) \
|
$(MAKE) -C $(HOST_BUILD_DIR) \
|
||||||
HOSTCFLAGS="$(HOST_CFLAGS)" \
|
HOSTCFLAGS="$(HOST_CFLAGS)" \
|
||||||
HOSTLDFLAGS="$(HOST_LDFLAGS)" \
|
HOSTLDFLAGS="$(HOST_LDFLAGS)" \
|
||||||
PKG_CONFIG_EXTRAARGS="--static" \
|
PKG_CONFIG_EXTRAARGS="--static" \
|
||||||
no-dot-config-targets=tools-only \
|
V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1) \
|
||||||
CONFIG_MKIMAGE_DTC_PATH=dtc \
|
tools-only_config \
|
||||||
CONFIG_FIT=y \
|
|
||||||
CONFIG_FIT_SIGNATURE=y \
|
|
||||||
CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 \
|
|
||||||
CONFIG_TOOLS_LIBCRYPTO=y \
|
|
||||||
tools-only
|
tools-only
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -0,0 +1,25 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Huangbin Zhan <zhanhb88@gmail.com>
|
||||||
|
Date: Fri, 18 Feb 2022 14:19:23 +0800
|
||||||
|
Subject: [PATCH] tools: disable TOOLS_FIT_FULL_CHECK
|
||||||
|
|
||||||
|
U-Boot disallows unit addresses by default. Disable TOOLS_FIT_FULL_CHECK
|
||||||
|
to allow at symbol in node names.
|
||||||
|
|
||||||
|
https://github.com/openwrt/openwrt/commits/master/scripts/mkits.sh
|
||||||
|
https://github.com/u-boot/u-boot/commit/3f04db891a353f4b127ed57279279f851c6b4917
|
||||||
|
---
|
||||||
|
tools/Kconfig | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
--- a/tools/Kconfig
|
||||||
|
+++ b/tools/Kconfig
|
||||||
|
@@ -31,7 +31,7 @@ config TOOLS_FIT
|
||||||
|
Enable FIT support in the tools builds.
|
||||||
|
|
||||||
|
config TOOLS_FIT_FULL_CHECK
|
||||||
|
- def_bool y
|
||||||
|
+ bool "Do a full check of the FIT"
|
||||||
|
help
|
||||||
|
Do a full check of the FIT before using it in the tools builds
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user