From 2b134f9549dacd73621be11bb7894bacd3c7b0a1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 13 May 2022 16:42:12 +0200 Subject: [PATCH] {toolchain, linux-headers}: add support for 5.17.x headers Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 11 ++++++++++- toolchain/Config.in | 4 ++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index e6ac7af19d..2a96eef8d3 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256 22f67ef6b12ef6c0c0353be4b90b4bf4b9b18b858c16c346fa495b67ec718c99 linux-5.17.7.tar.xz sha256 d8060dc88f862baaae66b42a2dbc12298ed667c698eb5c55617a7786ee47bf25 linux-5.16.20.tar.xz sha256 888641634f9e0e38cd0efcfec92ea3c126d381b24a514740d3fe3dc9988fd7ad linux-5.15.39.tar.xz sha256 f5e417b32f89318b6d0a230109a592ffd68997817463dc4692fa49ec7fe42f71 linux-5.10.115.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 36af5d0a20..5ff616fb34 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -59,6 +59,10 @@ config BR2_KERNEL_HEADERS_5_15 config BR2_KERNEL_HEADERS_5_16 bool "Linux 5.16.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + +config BR2_KERNEL_HEADERS_5_17 + bool "Linux 5.17.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -136,8 +140,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_5_17 + bool "5.17.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16 - bool "5.16.x or later" + bool "5.16.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 @@ -382,6 +390,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.115" if BR2_KERNEL_HEADERS_5_10 default "5.15.39" if BR2_KERNEL_HEADERS_5_15 default "5.16.20" if BR2_KERNEL_HEADERS_5_16 + default "5.17.7" if BR2_KERNEL_HEADERS_5_17 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 b572a89f2f..73ea78624a 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -572,6 +572,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 683204e56e..0c8b83fc0e 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_5_17 + bool "5.17.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_16 - bool "5.16.x or later" + bool "5.16.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_15