From 66adee919d111dfc8312fc9313cd4b454769ea86 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Mar 2025 16:25:44 +0100 Subject: [PATCH] {toolchain, linux-headers}: add support for 6.13 headers And add (and default to) 6.13 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 a229630aba..3efdb8b531 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 283ecb0784f3fbc16dd822fb1d9642e230ec7515ed33f120e551b839f355e6e2 linux-6.13.5.tar.xz sha256 5c205cd34f80974e4973e321cb008f5f6895a8aa8c2577f06a9448cd77de63b3 linux-6.12.17.tar.xz sha256 6cf911d01324f45c9dd2f44cf06f55bda0ecf383bc498f132a0c549768531327 linux-6.6.80.tar.xz sha256 9d63e3bfde75a44a99e18812b002e5e5c0797b4eb3db408a7a9225c2c719b52b linux-6.1.129.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 54d5720af2..ff56581b03 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_12 + default BR2_KERNEL_HEADERS_6_13 help Select the kernel version to get headers from. @@ -47,6 +47,10 @@ config BR2_KERNEL_HEADERS_6_6 config BR2_KERNEL_HEADERS_6_12 bool "Linux 6.12.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 + +config BR2_KERNEL_HEADERS_6_13 + bool "Linux 6.13.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -125,8 +129,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_13 + bool "6.13.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12 - bool "6.12.x or later" + bool "6.12.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11 @@ -434,6 +442,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.1.129" if BR2_KERNEL_HEADERS_6_1 default "6.6.80" if BR2_KERNEL_HEADERS_6_6 default "6.12.17" if BR2_KERNEL_HEADERS_6_12 + default "6.13.5" if BR2_KERNEL_HEADERS_6_13 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 94723da141..2290d13ad0 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -645,6 +645,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -658,6 +662,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 default "6.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 default "6.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 default "6.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 2dc04747b3..e1ecf06e4a 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -166,8 +166,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_13 + bool "6.13.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_12 - bool "6.12.x or later" + bool "6.12.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_11