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

And add (and default to) 6.7 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:31 +01:00
committed by Arnout Vandecappelle
parent 9553dc9a55
commit c21a0556db
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 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz
sha256 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz sha256 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz
sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc

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_6 default BR2_KERNEL_HEADERS_6_7
help help
Select the kernel version to get headers from. Select the kernel version to get headers from.
@@ -47,6 +47,10 @@ config BR2_KERNEL_HEADERS_6_1
config BR2_KERNEL_HEADERS_6_6 config BR2_KERNEL_HEADERS_6_6
bool "Linux 6.6.x kernel headers" bool "Linux 6.6.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
config BR2_KERNEL_HEADERS_6_7
bool "Linux 6.7.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
select BR2_KERNEL_HEADERS_LATEST select BR2_KERNEL_HEADERS_LATEST
config BR2_KERNEL_HEADERS_VERSION config BR2_KERNEL_HEADERS_VERSION
@@ -124,8 +128,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_7
bool "6.7.x or later"
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
bool "6.6.x or later" bool "6.6.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5
@@ -409,6 +417,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.15.151" if BR2_KERNEL_HEADERS_5_15 default "5.15.151" if BR2_KERNEL_HEADERS_5_15
default "6.1.81" if BR2_KERNEL_HEADERS_6_1 default "6.1.81" if BR2_KERNEL_HEADERS_6_1
default "6.6.21" if BR2_KERNEL_HEADERS_6_6 default "6.6.21" if BR2_KERNEL_HEADERS_6_6
default "6.7.10" if BR2_KERNEL_HEADERS_6_7
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

@@ -645,6 +645,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
bool bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
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
@@ -658,6 +662,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.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
default "6.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 default "6.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4

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_7
bool "6.7.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6
bool "6.6.x or later" bool "6.6.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_5 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_5