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

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

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
Bernd Kuhls 2024-03-16 09:43:33 +01:00 committed by Arnout Vandecappelle
parent 44c221c856
commit 807a449256
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 # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 8d0c8936e3140a0fbdf511ad7a9f21121598f3656743898f47bb9052d37cff68 linux-6.8.1.tar.xz
sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz
sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz
sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.tar.xz sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.tar.xz

View File

@ -3,7 +3,7 @@ comment "Kernel Header Options"
choice choice
prompt "Kernel Headers" prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
default BR2_KERNEL_HEADERS_6_7 default BR2_KERNEL_HEADERS_6_8
help help
Select the kernel version to get headers from. Select the kernel version to get headers from.
@ -51,6 +51,10 @@ config BR2_KERNEL_HEADERS_6_6
config BR2_KERNEL_HEADERS_6_7 config BR2_KERNEL_HEADERS_6_7
bool "Linux 6.7.x kernel headers" bool "Linux 6.7.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
config BR2_KERNEL_HEADERS_6_8
bool "Linux 6.8.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
select BR2_KERNEL_HEADERS_LATEST select BR2_KERNEL_HEADERS_LATEST
config BR2_KERNEL_HEADERS_VERSION config BR2_KERNEL_HEADERS_VERSION
@ -128,8 +132,12 @@ choice
If your kernel headers are more recent than the latest version If your kernel headers are more recent than the latest version
in the choice, then select the latest version. in the choice, then select the latest version.
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8
bool "6.8.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7
bool "6.7.x or later" bool "6.7.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6
@ -418,6 +426,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "6.1.82" if BR2_KERNEL_HEADERS_6_1 default "6.1.82" if BR2_KERNEL_HEADERS_6_1
default "6.6.22" if BR2_KERNEL_HEADERS_6_6 default "6.6.22" if BR2_KERNEL_HEADERS_6_6
default "6.7.10" if BR2_KERNEL_HEADERS_6_7 default "6.7.10" if BR2_KERNEL_HEADERS_6_7
default "6.8.1" if BR2_KERNEL_HEADERS_6_8
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \

View File

@ -649,6 +649,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
bool bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
select BR2_TOOLCHAIN_HEADERS_LATEST select BR2_TOOLCHAIN_HEADERS_LATEST
# This should be selected by the latest version, above, to indicate that # This should be selected by the latest version, above, to indicate that
@ -662,6 +666,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
# stops affecting a value on the first matching default. # stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string string
default "6.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5

View File

@ -162,8 +162,12 @@ choice
If your toolchain uses headers newer than the latest version If your toolchain uses headers newer than the latest version
in the choice, then select the latest version. in the choice, then select the latest version.
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_8
bool "6.8.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_7 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_7
bool "6.7.x or later" bool "6.7.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6