From 5dc3cfbff11934a3b29f8b2b98aed22ec01e7c42 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 3 Mar 2022 22:50:07 +0100 Subject: [PATCH] package/linux-headers: default to 5.15 series for _HEADERS_AS_KERNEL / KERNEL_LATEST_VERSION Fixes #14611 BR2_KERNEL_HEADERS_LATEST_VERSION selects a 5.15.x series kernel (as that is current LTS), but support for 5.16.x kernel headers has been added, so by default the "custom kernel headers series" option ends up with 5.16.x (the first option), leading to confusing errors: Incorrect selection of kernel headers: expected 5.16.x, got 5.15.x As a help, default to the correct 5.15.x series when this combination is used. Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 248a9a2d97..8543f1cd21 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -127,6 +127,8 @@ endif choice bool "Custom kernel headers series" + default BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 if \ + (BR2_KERNEL_HEADERS_AS_KERNEL && BR2_LINUX_KERNEL_LATEST_VERSION) depends on BR2_KERNEL_HEADERS_VERSION || BR2_KERNEL_HEADERS_AS_KERNEL || \ BR2_KERNEL_HEADERS_CUSTOM_TARBALL || BR2_KERNEL_HEADERS_CUSTOM_GIT help