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

And add (and default to) 6.11 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 2024-10-13 12:33:39 +02:00 committed by Thomas Petazzoni
parent 9a20320820
commit 8142ae5c2a
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 057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73 linux-6.11.3.tar.xz
sha256 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e linux-6.10.14.tar.xz sha256 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e linux-6.10.14.tar.xz
sha256 f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 linux-6.6.56.tar.xz sha256 f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 linux-6.6.56.tar.xz
sha256 8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24 linux-6.1.112.tar.xz sha256 8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24 linux-6.1.112.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_10 default BR2_KERNEL_HEADERS_6_11
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_10 config BR2_KERNEL_HEADERS_6_10
bool "Linux 6.10.x kernel headers" bool "Linux 6.10.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
config BR2_KERNEL_HEADERS_6_11
bool "Linux 6.11.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
select BR2_KERNEL_HEADERS_LATEST select BR2_KERNEL_HEADERS_LATEST
config BR2_KERNEL_HEADERS_VERSION config BR2_KERNEL_HEADERS_VERSION
@ -129,8 +133,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_11
bool "6.11.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10
bool "6.10.x or later" bool "6.10.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9
@ -431,6 +439,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "6.1.112" if BR2_KERNEL_HEADERS_6_1 default "6.1.112" if BR2_KERNEL_HEADERS_6_1
default "6.6.56" if BR2_KERNEL_HEADERS_6_6 default "6.6.56" if BR2_KERNEL_HEADERS_6_6
default "6.10.14" if BR2_KERNEL_HEADERS_6_10 default "6.10.14" if BR2_KERNEL_HEADERS_6_10
default "6.11.3" if BR2_KERNEL_HEADERS_6_11
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

@ -656,6 +656,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
bool bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
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
@ -669,6 +673,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.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
default "6.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 default "6.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
default "6.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 default "6.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
default "6.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 default "6.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8

View File

@ -166,8 +166,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_11
bool "6.11.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_10 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_10
bool "6.10.x or later" bool "6.10.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_9 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_9