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

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

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls 2023-09-23 19:32:50 +02:00 committed by Peter Korsgaard
parent 181cf756ca
commit 18d21c9cfc
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 8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95 linux-6.5.5.tar.xz
sha256 9626ec84a39ecb009bf11a271dd520941159c165d4e62f82e3a77b79d20ff27d linux-6.4.16.tar.xz
sha256 a87e241ec15d53452c4efe219713a3769d88cc436b5b98cf6efb262c4aff15c0 linux-6.1.55.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_4
default BR2_KERNEL_HEADERS_6_5
help
Select the kernel version to get headers from.
@ -52,6 +52,10 @@ config BR2_KERNEL_HEADERS_6_1
config BR2_KERNEL_HEADERS_6_4
bool "Linux 6.4.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
config BR2_KERNEL_HEADERS_6_5
bool "Linux 6.5.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
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_5
bool "6.5.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4
bool "6.4.x or later"
bool "6.4.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_3
@ -407,6 +415,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.15.133" if BR2_KERNEL_HEADERS_5_15
default "6.1.55" if BR2_KERNEL_HEADERS_6_1
default "6.4.16" if BR2_KERNEL_HEADERS_6_4
default "6.5.5" if BR2_KERNEL_HEADERS_6_5
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

@ -636,6 +636,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
select BR2_TOOLCHAIN_HEADERS_LATEST
# This should be selected by the latest version, above, to indicate that
@ -649,6 +653,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
# stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string
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
default "6.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2

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_5
bool "6.5.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_4
bool "6.4.x or later"
bool "6.4.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_3