{toolchain, linux-headers}: add support for 6.4 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-06-28 16:41:17 +02:00 committed by Peter Korsgaard
parent 3512b76f2e
commit 32230a52aa
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 8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3 linux-6.4.tar.xz
sha256 e0a9ad8692b2191cbd33db371a780a3fe375de90123a307ecd874c0860cd46e3 linux-6.3.10.tar.xz
sha256 d8ca0e300f30b9ff70c6e1497c638a1dac1407f45d3655e9c62c6e45a08afe6b linux-6.1.36.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_3
default BR2_KERNEL_HEADERS_6_4
help
Select the kernel version to get headers from.
@ -52,6 +52,10 @@ config BR2_KERNEL_HEADERS_6_1
config BR2_KERNEL_HEADERS_6_3
bool "Linux 6.3.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
config BR2_KERNEL_HEADERS_6_4
bool "Linux 6.4.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
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_4
bool "6.4.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_3
bool "6.3.x or later"
bool "6.3.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_2
@ -403,6 +411,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.15.119" if BR2_KERNEL_HEADERS_5_15
default "6.1.36" if BR2_KERNEL_HEADERS_6_1
default "6.3.10" if BR2_KERNEL_HEADERS_6_3
default "6.4" if BR2_KERNEL_HEADERS_6_4
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

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

View File

@ -142,8 +142,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_4
bool "6.4.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_3
bool "6.3.x or later"
bool "6.3.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_2