From db678645eb1702e007414a9e9d5073d541a7c6d3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 4 Oct 2022 21:50:30 +0200 Subject: [PATCH] {toolchain, linux-headers}: add support for 5.18 headers Do not add a preconfigured 5.18.x version to linux-headers as 5.18.x is already EOL. Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++++- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index ab59bdd368..9d993a2e99 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -133,8 +133,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_18 + bool "5.18.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17 - bool "5.17.x or later" + bool "5.17.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16 diff --git a/toolchain/Config.in b/toolchain/Config.in index 219578092b..c49691cff2 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -567,6 +567,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -580,6 +584,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 default "5.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 default "5.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 default "5.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 6727778f42..16f1ac0a5e 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_18 + bool "5.18.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_17 - bool "5.17.x or later" + bool "5.17.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_16