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

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls 2023-04-28 20:07:48 +02:00 committed by Peter Korsgaard
parent b73d16cdcf
commit eadff4efe9
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 ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e linux-6.3.tar.xz
sha256 c7dded14e368834b18bb2ad64af65560d8bcb9d2d6597e0f6ef151fded01e577 linux-6.2.13.tar.xz sha256 c7dded14e368834b18bb2ad64af65560d8bcb9d2d6597e0f6ef151fded01e577 linux-6.2.13.tar.xz
sha256 dfdcc143a879d64a5ee99213b2b4b05b5dccd566c144df93bca1e204df64c110 linux-6.1.26.tar.xz sha256 dfdcc143a879d64a5ee99213b2b4b05b5dccd566c144df93bca1e204df64c110 linux-6.1.26.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_2 default BR2_KERNEL_HEADERS_6_3
help help
Select the kernel version to get headers from. Select the kernel version to get headers from.
@ -52,6 +52,10 @@ config BR2_KERNEL_HEADERS_6_1
config BR2_KERNEL_HEADERS_6_2 config BR2_KERNEL_HEADERS_6_2
bool "Linux 6.2.x kernel headers" bool "Linux 6.2.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2
config BR2_KERNEL_HEADERS_6_3
bool "Linux 6.3.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
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_3
bool "6.3.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_2 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_2
bool "6.2.x or later" bool "6.2.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1
@ -399,6 +407,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.15.109" if BR2_KERNEL_HEADERS_5_15 default "5.15.109" if BR2_KERNEL_HEADERS_5_15
default "6.1.26" if BR2_KERNEL_HEADERS_6_1 default "6.1.26" if BR2_KERNEL_HEADERS_6_1
default "6.2.13" if BR2_KERNEL_HEADERS_6_2 default "6.2.13" if BR2_KERNEL_HEADERS_6_2
default "6.3" if BR2_KERNEL_HEADERS_6_3
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

@ -604,6 +604,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2
bool bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2
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
@ -617,6 +621,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.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
default "6.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 default "6.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2
default "6.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 default "6.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1
default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0

View File

@ -127,8 +127,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_3
bool "6.3.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_2 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_2
bool "6.2.x or later" bool "6.2.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_1 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_1