{toolchain, linux-headers}: add support for 6.6 headers

And add (and default to) 6.6 to linux-headers.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2023-10-30 07:41:00 +01:00 committed by Thomas Petazzoni
parent 82b17f5757
commit f3a81cc068
4 changed files with 22 additions and 3 deletions

View File

@ -1,4 +1,5 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0 linux-6.6.tar.xz
sha256 c6662f64713f56bf30e009c32eac15536fad5fd1c02e8a3daf62a0dc2f058fd5 linux-6.5.9.tar.xz
sha256 58520e7ae5a6af254ddf7ddbfc42e4373b0d36c67d467f6e35a3bd1672f5fb0a linux-6.1.60.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc

View File

@ -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_5
default BR2_KERNEL_HEADERS_6_6
help
Select the kernel version to get headers from.
@ -52,6 +52,10 @@ config BR2_KERNEL_HEADERS_6_1
config BR2_KERNEL_HEADERS_6_5
bool "Linux 6.5.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
config BR2_KERNEL_HEADERS_6_6
bool "Linux 6.6.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
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_6
bool "6.6.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5
bool "6.5.x or later"
bool "6.5.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4
@ -411,6 +419,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.15.137" if BR2_KERNEL_HEADERS_5_15
default "6.1.60" if BR2_KERNEL_HEADERS_6_1
default "6.5.9" if BR2_KERNEL_HEADERS_6_5
default "6.6" if BR2_KERNEL_HEADERS_6_6
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 \

View File

@ -640,6 +640,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
select BR2_TOOLCHAIN_HEADERS_LATEST
# This should be selected by the latest version, above, to indicate that
@ -653,6 +657,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
# stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string
default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
default "6.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
default "6.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3

View File

@ -162,8 +162,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_6
bool "6.6.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_5
bool "6.5.x or later"
bool "6.5.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_4