openwrt-mirror/openwrt
1
0 Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-10-13 15:28:21 +04:00
Code Issues Packages Projects Releases Wiki Activity

uboot-tools: update to version 2026.10

Browse Source 
Update to the latest release. Adjust the `PKG_BUILD_DIR` directory
pattern to align with upstream changes. Remove unused variable
`PKG_SOURCE_SUBDIR`. Out-of-sync server URLs have also been removed[1].

Manually rebased patch:
- 014-tools-fit_check_sign-no-decompress.patch[2]

[1] https://lore.kernel.org/u-boot/20261010142922.GI769217@bill-the-cat/
[2] https://git.u-boot-project.org/u-boot/u-boot/-/commit/79b6ee1a4b3ce9ca2db0429fc2e8dfb4110cd7e8

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/25784
Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Shiji Yang authored and Nick Hainke committed 2026-10-11 09:41:31 +02:00
1 parent 24de657e0f
commit ac46a4eafd
4 files changed
+14 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

package/boot/uboot-tools/Makefile
+5 -8
View File
@@ -1,18 +1,15 @@
include $(TOPDIR)/rules.mk
PKG_DISTNAME:=u-boot
PKG_VERSION:=2026.07
PKG_RELEASE:=5
PKG_VERSION:=2026.10
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \
https://git.u-boot-project.org/u-boot/u-boot/-/releases/v$(PKG_VERSION)/downloads \
https://ftp.denx.de/pub/u-boot \
https://mirror.cyberbits.eu/u-boot
https://git.u-boot-project.org/u-boot/u-boot/-/releases/v$(PKG_VERSION)/downloads
PKG_URL:=https://docs.u-boot-project.org/en/latest/
PKG_HASH:=78e8bfc382fe388f9b55aa1daf8c563522a037779b5d4c349d1415e381f1243e
PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION)
PKG_HASH:=3f856da3cbbc93af51ff95fde18588a348b4a26723b01d9841e999d988481015
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-v$(PKG_VERSION)
PKG_BUILD_DEPENDS:=fstools
package/boot/uboot-tools/patches/003-tools-dumpimage-fix-tools-compile.patch
+1 -1
View File
@@ -44,7 +44,7 @@ Signed-off-by: Scott Mercer <TheRootEd24@gmail.com>
# Enable all the config-independent tools
ifneq ($(HOST_TOOLS_ALL),)
CONFIG_ARCH_KIRKWOOD = y
@@ -327,8 +347,7 @@ HOST_EXTRACFLAGS += -include $(srctree)/
@@ -328,8 +348,7 @@ HOST_EXTRACFLAGS += -include $(srctree)/
-I$(srctree)/scripts/dtc/libfdt \
-I$(srctree)/tools \
-DUSE_HOSTCC \
package/boot/uboot-tools/patches/013-tools-fit_check_sign-all-image-types.patch
+4 -4
View File
@@ -1,6 +1,6 @@
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -1270,20 +1270,18 @@ static int bootm_host_load_image(const v
@@ -1318,20 +1318,18 @@ static int bootm_host_load_image(const v
int bootm_host_load_images(const void *fit, int cfg_noffset)
{
@@ -28,7 +28,7 @@
/* Return the first error we found */
--- a/boot/image-fit.c
+++ b/boot/image-fit.c
@@ -2095,8 +2095,10 @@ int fit_image_load(struct bootm_headers
@@ -2156,8 +2156,10 @@ int fit_image_load(struct bootm_headers
fit_uname_config = fit_uname_configp ? *fit_uname_configp : NULL;
fit_base_uname_config = NULL;
prop_name = fit_get_image_type_property(ph_type);
@@ -39,7 +39,7 @@
bootstage_mark(bootstage_id + BOOTSTAGE_SUB_FORMAT);
ret = fit_check_format(fit, IMAGE_SIZE_INVAL);
@@ -2134,7 +2136,9 @@ int fit_image_load(struct bootm_headers
@@ -2195,7 +2197,9 @@ int fit_image_load(struct bootm_headers
cfg_noffset = ret;
fit_base_uname_config = fdt_get_name(fit, cfg_noffset, NULL);
@@ -49,7 +49,7 @@
/* Remember this config */
if (image_type == IH_TYPE_KERNEL)
images->fit_uname_cfg = fit_base_uname_config;
@@ -2156,7 +2160,9 @@ int fit_image_load(struct bootm_headers
@@ -2217,7 +2221,9 @@ int fit_image_load(struct bootm_headers
image_ph_phase(ph_type));
}
if (noffset < 0) {
package/boot/uboot-tools/patches/014-tools-fit_check_sign-no-decompress.patch
+4 -3
View File
@@ -1,6 +1,6 @@
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -1229,10 +1229,6 @@ static int bootm_host_load_image(const v
@@ -1276,10 +1276,6 @@ static int bootm_host_load_image(const v
ulong data, len;
struct bootm_headers images;
int noffset;
@@ -11,7 +11,7 @@
int ret;
fit_uname_config = fdt_get_name(fit, cfg_noffset, NULL);
@@ -1244,26 +1240,6 @@ static int bootm_host_load_image(const v
@@ -1291,27 +1287,6 @@ static int bootm_host_load_image(const v
FIT_LOAD_IGNORED, &data, &len);
if (noffset < 0)
return noffset;
@@ -31,7 +31,8 @@
- free(load_buf);
-
- if (ret) {
- ret = handle_decomp_error(image_comp, load_end - 0, buf_size, ret);
- ret = handle_decomp_error(image_comp, load_end - 0, buf_size,
- BOOTM_DECOMP_LIMIT_GLOBAL, ret);
- if (ret != BOOTM_ERR_UNIMPLEMENTED)
- return ret;
- }