From fffb245f66bc5d86623000e8e41d2e0057915100 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 17 Dec 2023 18:18:20 +0100 Subject: [PATCH] package/linux-headers: drop 6.5.x option The 6.5.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Bernd Kuhls [Peter: drop option from linux-headers/Config.host.in] Signed-off-by: Peter Korsgaard --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 312d53943c..4689226290 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.11" +config BR2_KERNEL_HEADERS_6_5 + bool "kernel headers version 6.5.x are no longer supported" + select BR2_LEGACY + help + Version 6.5.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_PYTHON_PYXB bool "python-pyxb removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index ed9c6143db..9572acda2d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 28edfc3d4f90cd738f2a20f5a2d68510268176d6111f6278d8f495edfd9495a7 linux-6.6.3.tar.xz -sha256 78fbd43822f4c56bc16e89e8874767f592532e1a0ffcd1af4dd279559b5fcbb5 linux-6.5.13.tar.xz sha256 629daa38f3ea67f29610bfbd53f9f38f46834d3654451e9474100490c66dc7e7 linux-6.1.64.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 be2bee8b346f3ccb35879f16c80a323edda571e36190403805c14a9ea24e4a47 linux-5.15.140.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 344acc9cde..b00d5743a3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -49,10 +49,6 @@ config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 -config BR2_KERNEL_HEADERS_6_5 - bool "Linux 6.5.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 - config BR2_KERNEL_HEADERS_6_6 bool "Linux 6.6.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 @@ -418,7 +414,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.202" if BR2_KERNEL_HEADERS_5_10 default "5.15.140" if BR2_KERNEL_HEADERS_5_15 default "6.1.64" if BR2_KERNEL_HEADERS_6_1 - default "6.5.13" if BR2_KERNEL_HEADERS_6_5 default "6.6.3" if BR2_KERNEL_HEADERS_6_6 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL