diff --git a/board/cubietech/cubieboard1/patches/linux-headers/linux-headers.hash b/board/cubietech/cubieboard1/patches/linux-headers/linux-headers.hash deleted file mode 120000 index 5808d92afe89..000000000000 --- a/board/cubietech/cubieboard1/patches/linux-headers/linux-headers.hash +++ /dev/null @@ -1 +0,0 @@ -../linux/linux.hash \ No newline at end of file diff --git a/board/cubietech/cubieboard1/patches/linux/linux.hash b/board/cubietech/cubieboard1/patches/linux/linux.hash index 9ef8b4af9c55..aac576b5f935 100644 --- a/board/cubietech/cubieboard1/patches/linux/linux.hash +++ b/board/cubietech/cubieboard1/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 b4850cf670a032c70f38b713a27d62046c5f747caf028c5f50b18f98606a9eb1 linux-6.12.52.tar.xz +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 4d9f3ff73214f68c0194ef02db9ca4b7ba713253ac1045441d4e9f352bc22e14 linux-6.19.6.tar.xz diff --git a/board/cubietech/cubieboard1/patches/uboot/uboot.hash b/board/cubietech/cubieboard1/patches/uboot/uboot.hash index 98a5c53aaf97..b6a925ea4e89 100644 --- a/board/cubietech/cubieboard1/patches/uboot/uboot.hash +++ b/board/cubietech/cubieboard1/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 +sha256 b60d5865cefdbc75da8da4156c56c458e00de75a49b80c1a2e58a96e30ad0d54 u-boot-2026.01.tar.bz2 diff --git a/board/cubietech/cubieboard2/patches/linux-headers/linux-headers.hash b/board/cubietech/cubieboard2/patches/linux-headers/linux-headers.hash deleted file mode 120000 index 5808d92afe89..000000000000 --- a/board/cubietech/cubieboard2/patches/linux-headers/linux-headers.hash +++ /dev/null @@ -1 +0,0 @@ -../linux/linux.hash \ No newline at end of file diff --git a/board/cubietech/cubieboard2/patches/linux/linux.hash b/board/cubietech/cubieboard2/patches/linux/linux.hash index 9ef8b4af9c55..aac576b5f935 100644 --- a/board/cubietech/cubieboard2/patches/linux/linux.hash +++ b/board/cubietech/cubieboard2/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 b4850cf670a032c70f38b713a27d62046c5f747caf028c5f50b18f98606a9eb1 linux-6.12.52.tar.xz +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 4d9f3ff73214f68c0194ef02db9ca4b7ba713253ac1045441d4e9f352bc22e14 linux-6.19.6.tar.xz diff --git a/board/cubietech/cubieboard2/patches/uboot/uboot.hash b/board/cubietech/cubieboard2/patches/uboot/uboot.hash index 98a5c53aaf97..b6a925ea4e89 100644 --- a/board/cubietech/cubieboard2/patches/uboot/uboot.hash +++ b/board/cubietech/cubieboard2/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 +sha256 b60d5865cefdbc75da8da4156c56c458e00de75a49b80c1a2e58a96e30ad0d54 u-boot-2026.01.tar.bz2 diff --git a/configs/cubieboard1_defconfig b/configs/cubieboard1_defconfig index 7948ab3b1947..47d882c04ff5 100644 --- a/configs/cubieboard1_defconfig +++ b/configs/cubieboard1_defconfig @@ -1,6 +1,8 @@ BR2_arm=y BR2_cortex_a8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/cubietech/cubieboard1/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/cubietech/cubieboard1/rootfs_overlay" @@ -8,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/cubietech/cubieboard1/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.52" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.19.6" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun4i-a10-cubieboard" @@ -18,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2026.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index 43ef33e32965..0de3edb93ed3 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,7 +1,9 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/cubietech/cubieboard2/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/cubietech/cubieboard2/rootfs_overlay" @@ -9,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/cubietech/cubieboard2/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.52" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.19.6" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-cubieboard2" @@ -19,7 +21,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2026.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/package/e2fsprogs/0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch b/package/e2fsprogs/0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch deleted file mode 100644 index 36442a53b81e..000000000000 --- a/package/e2fsprogs/0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 1a2ce8cd956065106ae27a36a5000f00ebc4591f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 22 Nov 2025 21:12:23 +0100 -Subject: [PATCH] configure.ac: check for FS_IOC_READ_VERITY_METADATA - availability -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 6bfa843b4435334ac073e42950b48d8bacb54977 ("mke2fs: enable -copying of fs-verity metadata") introduced support for reading -fs-verity metadata, which requires using the -FS_IOC_READ_VERITY_METADATA. - -The code is conditionally compiled when the kernel headers have - available. Unfortunately, this check is not -sufficient: was introduced in Linux 5.10, but the -FS_IOC_READ_VERITY_METADATA was not introduced before 5.12, so if one -is using 5.10 or 5.11 kernel headers, the build fails with: - -./../misc/create_inode.c: In function ‘copy_fs_verity_data’: -./../misc/create_inode.c:589:10: error: variable ‘arg’ has initializer but incomplete type - 589 | struct fsverity_read_metadata_arg arg = { - | ^~~~~~~~~~~~~~~~~~~~~~~~~~ -[...] -./../misc/create_inode.c:600:20: error: ‘FS_IOC_READ_VERITY_METADATA’ undeclared (first use in this function) - 600 | size = ioctl(fd, FS_IOC_READ_VERITY_METADATA, &arg); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ - -This commit therefore extends the configure.ac check to ensure that -not only exists but also that it defines the -FS_IOC_READ_VERITY_METADATA ioctl. - -Upstream: https://github.com/tytso/e2fsprogs/pull/256 -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 18 ++++++++++++++++++ - misc/create_inode.c | 6 +++--- - 2 files changed, 21 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a0171163..3e5586a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1997,6 +1997,24 @@ OS_IO_FILE="" - esac] - AC_SUBST(OS_IO_FILE) - -+dnl Check for fsverity ioctl -+if test "${ac_cv_header_linux_fsverity_h}" = "yes"; then -+ AC_MSG_CHECKING([for FS_IOC_READ_VERITY_METADATA ioctl]) -+ AC_PREPROC_IFELSE( -+ [AC_LANG_PROGRAM([[ -+#include -+#ifndef FS_IOC_READ_VERITY_METADATA -+# error "FS_IOC_READ_VERITY_METADATA not available" -+#endif -+]], [])], [ -+ AC_DEFINE([HAVE_FS_IOC_READ_VERITY_METADATA], [1], [Define to 1 if FS_IOC_READ_VERITY_METADATA ioctl is available]) -+ AC_MSG_RESULT([yes]) -+ ], -+ [ -+ AC_MSG_RESULT([no]) -+ ]) -+fi -+ - dnl - dnl Make our output files, being sure that we create the some miscellaneous - dnl directories -diff --git a/misc/create_inode.c b/misc/create_inode.c -index 624efc03..a7918873 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -30,7 +30,7 @@ - #ifdef HAVE_SYS_SYSMACROS_H - #include - #endif --#ifdef HAVE_LINUX_FSVERITY_H -+#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA) - #include - #include - #endif -@@ -569,7 +569,7 @@ out: - } - #endif /* FS_IOC_FIEMAP */ - --#ifdef HAVE_LINUX_FSVERITY_H -+#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA) - static inline off_t round_up(off_t n, off_t blksz, off_t bias) - { - return ((n - bias + (blksz - 1)) & ~(blksz - 1)) + bias; -@@ -738,7 +738,7 @@ static errcode_t copy_file(ext2_filsys fs, int fd, struct stat *statbuf, - err = copy_file_chunk(fs, fd, e2_file, 0, statbuf->st_size, buf, - zerobuf); - --#ifdef HAVE_LINUX_FSVERITY_H -+#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA) - if (!err && (flags & EXT4_VERITY_FL)) - err = copy_fs_verity(fs, fd, e2_file, statbuf->st_size); - #endif --- -2.51.1 - diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 3afae18f2024..145545715294 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -1,5 +1,5 @@ -# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.3/sha256sums.asc -sha256 857e6ef800feaa2bb4578fbc810214be5d3c88b072ea53c5384733a965737329 e2fsprogs-1.47.3.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.4/sha256sums.asc +sha256 fd5bf388cbdbe006a3d3b318d983b2948382440acc85a87f1e7d108653e8db0b e2fsprogs-1.47.4.tar.xz # Locally calculated sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index ad3d1dbe75b3..d9ebf4c73d95 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -4,7 +4,7 @@ # ################################################################################ -E2FSPROGS_VERSION = 1.47.3 +E2FSPROGS_VERSION = 1.47.4 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) @@ -18,13 +18,6 @@ E2FSPROGS_INSTALL_STAGING = YES E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux -# 0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch -# the additional dependencies are only needed for autoreconf -E2FSPROGS_AUTORECONF = YES -E2FSPROGS_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive -E2FSPROGS_DEPENDENCIES += host-gettext host-autoconf-archive -HOST_E2FSPROGS_DEPENDENCIES += host-gettext host-autoconf-archive - E2FSPROGS_SELINUX_MODULES = fstools # e4defrag doesn't build on older systems like RHEL5.x, and we don't diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 57643c83180f..a6247282a8cc 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,4 +1,4 @@ -# From https://github.com/harfbuzz/harfbuzz/releases/tag/12.3.2 -sha256 6f6db164359a2da5a84ef826615b448b33e6306067ad829d85d5b0bf936f1bb8 harfbuzz-12.3.2.tar.xz +# From https://github.com/harfbuzz/harfbuzz/releases/tag/13.0.1 +sha256 3553d943401c34ab9b8c75f35cdb8452ca660233b0e9d4a22395ce5245484bd7 harfbuzz-13.0.1.tar.xz # Locally computed sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 787f42d8209a..51bef1a68aed 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 12.3.2 +HARFBUZZ_VERSION = 13.0.1 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 9aa9151ebb33..bf7c4b61b604 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.8.5/sha256sums.asc -sha256 b13ca4a9df44186bdbe107514b22732d4243f785f95daf2fb86afc1edba15bbb nfs-utils-2.8.5.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.8.6/sha256sums.asc +sha256 2bd7b34e809a7eff2f4bc5fc5fd96ebcd66a5458b471a270cbd2dc169b011550 nfs-utils-2.8.6.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index ba87ef813e67..7ac0b549cff9 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.8.5 +NFS_UTILS_VERSION = 2.8.6 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ diff --git a/package/tbtools/tbtools.hash b/package/tbtools/tbtools.hash index f62d3c36d6bc..a66ae15e63ca 100644 --- a/package/tbtools/tbtools.hash +++ b/package/tbtools/tbtools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3fd91206483884f44ef757343f68c9acf91817ebbcdf4c0f6821a3734eb54984 tbtools-0.6.0-cargo4.tar.gz +sha256 114c0dfb3f30cc491c9fcb583adf0f8b356268d8207bfc8c73a5bffe990e0c6a tbtools-0.8.0-cargo4.tar.gz sha256 9b16a3add311d607af8d9b348a842a37840d0f47dfcc6cf2a7756ee02c24ed69 LICENSE diff --git a/package/tbtools/tbtools.mk b/package/tbtools/tbtools.mk index 3031b8614406..ed5ead332d96 100644 --- a/package/tbtools/tbtools.mk +++ b/package/tbtools/tbtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -TBTOOLS_VERSION = 0.6.0 +TBTOOLS_VERSION = 0.8.0 TBTOOLS_SITE = $(call github,intel,tbtools,v$(TBTOOLS_VERSION)) TBTOOLS_LICENSE = MIT TBTOOLS_LICENSE_FILES = LICENSE