From d9a1352e7d9fdda64e9cf8a2a6d398f8d4c83389 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 28 Jul 2025 21:10:28 +0200 Subject: [PATCH] {toolchain, linux-headers}: add support for 6.16 headers And add (and default to) 6.16 to linux-headers. Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 1e6602c878..8401af95e4 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 1a4be2fe6b5246aa4ac8987a8a4af34c42a8dd7d08b46ab48516bcc1befbcd83 linux-6.16.tar.xz sha256 d37e92bc16b962a3025df156647bdad90b2db4ff36c7a6137817fe81ef3f28a6 linux-6.15.8.tar.xz sha256 4811af1317f98d2cccea3c7695969a2c03a27cb02fd2d5327032dd5341842933 linux-6.12.40.tar.xz sha256 d6c0ec4d55b14814f55b62a0b23a2d95faf66877e48fbfb4b83523e4afdf97ba linux-6.6.100.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 23b65f8dee..37a44c2e3c 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_6_15 + default BR2_KERNEL_HEADERS_6_16 help Select the kernel version to get headers from. @@ -51,6 +51,10 @@ config BR2_KERNEL_HEADERS_6_12 config BR2_KERNEL_HEADERS_6_15 bool "Linux 6.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15 + +config BR2_KERNEL_HEADERS_6_16 + bool "Linux 6.16.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -129,8 +133,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_6_16 + bool "6.16.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_15 - bool "6.15.x or later" + bool "6.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_14 @@ -451,6 +459,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.6.100" if BR2_KERNEL_HEADERS_6_6 default "6.12.40" if BR2_KERNEL_HEADERS_6_12 default "6.15.8" if BR2_KERNEL_HEADERS_6_15 + default "6.16" if BR2_KERNEL_HEADERS_6_16 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 185a01057e..8f91b23562 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -657,6 +657,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -670,6 +674,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16 default "6.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15 default "6.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 default "6.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1580ffb920..bc34701455 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -173,8 +173,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_6_16 + bool "6.16.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_15 - bool "6.15.x or later" + bool "6.15.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_14