From 125d9f1b4ddd7a4e4a4ab4a43dc06cf42b328bc4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 15 Jun 2024 13:30:47 +0200 Subject: [PATCH] {toolchain, linux-headers}: add support for 6.9 headers And add (and default to) 6.9 to linux-headers. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- 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 9374af71b0..ac7028c535 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 272800e0d1a7d01a78bce95a3aaf5c80816f50eb15c517d7003e58355760ecc2 linux-6.9.4.tar.xz sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz sha256 a13ebc20dc2a75722699949af74aa86a4ce5d544d6daaa6a7de4e8c81b40de97 linux-6.6.33.tar.xz sha256 df31af2ef5923d61fadd68bfd991f50f2e42a913895eb4b03214ee78f8720bcf linux-6.1.93.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 487d941a16..e2664a523e 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_8 + default BR2_KERNEL_HEADERS_6_9 help Select the kernel version to get headers from. @@ -51,6 +51,10 @@ config BR2_KERNEL_HEADERS_6_6 config BR2_KERNEL_HEADERS_6_8 bool "Linux 6.8.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 + +config BR2_KERNEL_HEADERS_6_9 + bool "Linux 6.9.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -128,8 +132,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_9 + bool "6.9.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8 - bool "6.8.x or later" + bool "6.8.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7 @@ -422,6 +430,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.1.93" if BR2_KERNEL_HEADERS_6_1 default "6.6.33" if BR2_KERNEL_HEADERS_6_6 default "6.8.12" if BR2_KERNEL_HEADERS_6_8 + default "6.9.4" if BR2_KERNEL_HEADERS_6_9 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 baf69ce463..1aa17cbfbd 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -647,6 +647,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -660,6 +664,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 default "6.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1c4b0d2554..45a87fb3c8 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_9 + bool "6.9.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_8 - bool "6.8.x or later" + bool "6.8.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_7