From 4613b7aaf023607e8a1f3957b78a816e2e3a5905 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 4 Oct 2022 21:50:32 +0200 Subject: [PATCH] {toolchain, linux-headers}: add support for 6.0 headers And add (and default to) 6.0 to linux-headers. Signed-off-by: Peter Korsgaard --- linux/linux.hash | 2 ++ package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 9e75877be9..dde8e5c54c 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,3 +1,5 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e linux-6.0.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 4ecdb8b59c6f6f258d89cbf22eede210e0a55c09db884988fe706efe2fe8f148 linux-5.19.13.tar.xz sha256 4a1c922a490eeabf5b44d4fde36de9ba5b71711b7352c6258716da41160db628 linux-5.17.15.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 856c7fd7b1..4847cd4c87 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_5_19 + default BR2_KERNEL_HEADERS_6_0 help Select the kernel version to get headers from. @@ -60,6 +60,10 @@ config BR2_KERNEL_HEADERS_5_17 config BR2_KERNEL_HEADERS_5_19 bool "Linux 5.19.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 + +config BR2_KERNEL_HEADERS_6_0 + bool "Linux 6.0.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -137,8 +141,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_0 + bool "6.0.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19 - bool "5.19.x or later" + bool "5.19.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_18 @@ -396,6 +404,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.67" if BR2_KERNEL_HEADERS_5_15 default "5.17.15" if BR2_KERNEL_HEADERS_5_17 default "5.19.13" if BR2_KERNEL_HEADERS_5_19 + default "6.0" if BR2_KERNEL_HEADERS_6_0 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 \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 0801a3c516..23596d6c85 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -575,6 +575,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -588,6 +592,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 default "5.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 494e67516f..a9cb61365f 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -127,8 +127,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_0 + bool "6.0.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_19 - bool "5.19.x or later" + bool "5.19.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_18