From 9530d74ddb04d5fc81f9054ec0e76fbcb2a1e7d2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 15 Jun 2026 22:25:58 +0200 Subject: [PATCH] {toolchain, linux-headers}: add support for 7.1 headers Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- linux/from-6.17/linux.hash | 1 + package/linux-headers/7.1 | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 5 files changed, 23 insertions(+), 3 deletions(-) create mode 120000 package/linux-headers/7.1 diff --git a/linux/from-6.17/linux.hash b/linux/from-6.17/linux.hash index 8274594ec2..9aa69b6e96 100644 --- a/linux/from-6.17/linux.hash +++ b/linux/from-6.17/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v7.x/sha256sums.asc +sha256 691f44797fbe790dc8a321604c927087526ad27b6d649925d60f8eed0a2564a0 linux-7.1.tar.xz sha256 57edc9a41efc1ca6b797afa8f4a587a30da2af6bca7356eb56e1e1a4ada265da linux-7.0.12.tar.xz # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc diff --git a/package/linux-headers/7.1 b/package/linux-headers/7.1 new file mode 120000 index 0000000000..a4e1d3ec9c --- /dev/null +++ b/package/linux-headers/7.1 @@ -0,0 +1 @@ +../../linux/from-6.17 \ No newline at end of file diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3e3832b707..0b02c183c1 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_7_0 + default BR2_KERNEL_HEADERS_7_1 help Select the kernel version to get headers from. @@ -55,6 +55,10 @@ config BR2_KERNEL_HEADERS_6_18 config BR2_KERNEL_HEADERS_7_0 bool "Linux 7.0.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0 + +config BR2_KERNEL_HEADERS_7_1 + bool "Linux 7.1.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -133,8 +137,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_7_1 + bool "7.1.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_7_0 - bool "7.0.x or later" + bool "7.0.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_19 @@ -475,6 +483,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.12.93" if BR2_KERNEL_HEADERS_6_12 default "6.18.35" if BR2_KERNEL_HEADERS_6_18 default "7.0.12" if BR2_KERNEL_HEADERS_7_0 + default "7.1" if BR2_KERNEL_HEADERS_7_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 5aa6cf8f6d..7762106bee 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -680,6 +680,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -693,6 +697,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "7.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1 default "7.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0 default "6.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19 default "6.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index f69e09ecf0..003887f025 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -178,8 +178,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_7_1 + bool "7.1.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_7_0 - bool "7.0.x or later" + bool "7.0.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_19