From 6f311de2de918b883447438ef88eead935398203 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 Dec 2025 10:14:08 +0100 Subject: [PATCH] {toolchain, linux-headers}: add support for 6.18 headers And add (and default to) 6.18 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 fcb5bdb113..d14de29189 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 9106a4605da9e31ff17659d958782b815f9591ab308d03b0ee21aad6c7dced4b linux-6.18.tar.xz sha256 934b18af0125f114907bad482d7c5a97d58038970b9dce6162318e920caf257e linux-6.17.11.tar.xz sha256 1a69745105528676f12f29dc2494945d96cb23666dcc5223794abc22415f1735 linux-6.12.61.tar.xz sha256 3da09b980bb404cc28793479bb2d6c636522679215ffa65a04c893575253e5e8 linux-6.6.119.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a53f1a36bd..f4c440fe3f 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_17 + default BR2_KERNEL_HEADERS_6_18 help Select the kernel version to get headers from. @@ -57,6 +57,10 @@ config BR2_KERNEL_HEADERS_6_12 config BR2_KERNEL_HEADERS_6_17 bool "Linux 6.17.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17 + +config BR2_KERNEL_HEADERS_6_18 + bool "Linux 6.18.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -135,8 +139,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_18 + bool "6.18.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_17 - bool "6.17.x or later" + bool "6.17.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_16 @@ -465,6 +473,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.6.119" if BR2_KERNEL_HEADERS_6_6 default "6.12.61" if BR2_KERNEL_HEADERS_6_12 default "6.17.11" if BR2_KERNEL_HEADERS_6_17 + default "6.18" if BR2_KERNEL_HEADERS_6_18 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 5fcc9362ba..8330e652c2 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -675,6 +675,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -688,6 +692,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 default "6.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17 default "6.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16 default "6.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 9855b33ade..6991b899be 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_18 + bool "6.18.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_17 - bool "6.17.x or later" + bool "6.17.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_16