diff options
| author | Nick Hainke <vincent@systemli.org> | 2023-11-04 09:57:48 +0100 |
|---|---|---|
| committer | Nick Hainke <vincent@systemli.org> | 2023-11-09 12:50:04 +0100 |
| commit | a82c9699c43d185af4420a013ffb976e85652f46 (patch) | |
| tree | d317cf545ac0ae0696dd30e4c68d63bb0bca41f3 | |
| parent | 551963662b3c2d4a740a447855da410c0f217152 (diff) | |
| download | openwrt-a82c9699c43d185af4420a013ffb976e85652f46.tar.gz openwrt-a82c9699c43d185af4420a013ffb976e85652f46.tar.bz2 openwrt-a82c9699c43d185af4420a013ffb976e85652f46.zip | |
tools/mkimage: update to 2023.10
Update to latest version.
Remove "100-increase-tmpfile-name-length-limit.patch" because project
is now using limits.h with PATH_MAX [0].
Automatically refreshed:
- 030-allow-to-use-different-magic.patch
[0] - https://github.com/u-boot/u-boot/commit/99d430f344bfdb0641022fd3efa26c29c957df02
Signed-off-by: Nick Hainke <vincent@systemli.org>
| -rw-r--r-- | tools/mkimage/Makefile | 4 | ||||
| -rw-r--r-- | tools/mkimage/patches/030-allow-to-use-different-magic.patch | 4 | ||||
| -rw-r--r-- | tools/mkimage/patches/100-increase-tmpfile-name-length-limit.patch | 11 |
3 files changed, 4 insertions, 15 deletions
diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile index a6d54f5eff..5dceb9a471 100644 --- a/tools/mkimage/Makefile +++ b/tools/mkimage/Makefile @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mkimage -PKG_VERSION:=2023.04 +PKG_VERSION:=2023.10 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:=e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341 +PKG_HASH:=e00e6c6f014e046101739d08d06f328811cebcf5ae101348f409cbbd55ce6900 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION) diff --git a/tools/mkimage/patches/030-allow-to-use-different-magic.patch b/tools/mkimage/patches/030-allow-to-use-different-magic.patch index c33b0f4327..3689fcb531 100644 --- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch +++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch @@ -50,7 +50,7 @@ This patch makes it possible to set a custom image magic. break; --- a/tools/default_image.c +++ b/tools/default_image.c -@@ -63,7 +63,7 @@ static int image_verify_header(unsigned +@@ -68,7 +68,7 @@ static int image_verify_header(unsigned */ memcpy(hdr, ptr, sizeof(struct legacy_img_hdr)); @@ -59,7 +59,7 @@ This patch makes it possible to set a custom image magic. debug("%s: Bad Magic Number: \"%s\" is no valid image\n", params->cmdname, params->imagefile); return -FDT_ERR_BADMAGIC; -@@ -142,7 +142,7 @@ static void image_set_header(void *ptr, +@@ -147,7 +147,7 @@ static void image_set_header(void *ptr, } /* Build new header */ diff --git a/tools/mkimage/patches/100-increase-tmpfile-name-length-limit.patch b/tools/mkimage/patches/100-increase-tmpfile-name-length-limit.patch deleted file mode 100644 index aae8935601..0000000000 --- a/tools/mkimage/patches/100-increase-tmpfile-name-length-limit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/mkimage.h -+++ b/tools/mkimage.h -@@ -44,7 +44,7 @@ static inline ulong map_to_sysmem(void * - #define ALLOC_CACHE_ALIGN_BUFFER(type, name, size) type name[size] - - #define MKIMAGE_TMPFILE_SUFFIX ".tmp" --#define MKIMAGE_MAX_TMPFILE_LEN 256 -+#define MKIMAGE_MAX_TMPFILE_LEN 1024 - #define MKIMAGE_DEFAULT_DTC_OPTIONS "-I dts -O dtb -p 500" - #define MKIMAGE_MAX_DTC_CMDLINE_LEN 2 * MKIMAGE_MAX_TMPFILE_LEN + 35 - |