From cd8028b2201816db11ad9f55b34fea459de81a04 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 20 Jul 2023 07:39:15 +0200 Subject: [PATCH] package/linux-headers: drop 6.3.x option The 6.3.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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 5c7e13fd5d..2678e0ca70 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.08" +config BR2_KERNEL_HEADERS_6_3 + bool "kernel headers version 6.3.x are no longer supported" + select BR2_LEGACY + help + Version 6.3.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_TOVID bool "tovid removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 1d63d4226b..7541ae9123 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 9cbc4a2be714a4d154e1312c9f33ded91174907c8b15ee936ad27002ac75ff2a linux-6.4.4.tar.xz -sha256 ea460560e2898022c5f3c4649908694dcd75a094ffde726e8c6ca5e0a09491fb linux-6.3.13.tar.xz sha256 4cddee22fdf657138a06af653492f67cd3a4762c04a34725534bd200d99085b8 linux-6.1.39.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 6499089eae6b271063cb3e873ab7f4ba0543cfb21dcc9c54d9bcf5357db683f6 linux-5.15.120.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 9c8bbbe2c0..6eb7b3577b 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_3 - bool "Linux 6.3.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3 - config BR2_KERNEL_HEADERS_6_4 bool "Linux 6.4.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 @@ -410,7 +406,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.186" if BR2_KERNEL_HEADERS_5_10 default "5.15.120" if BR2_KERNEL_HEADERS_5_15 default "6.1.39" if BR2_KERNEL_HEADERS_6_1 - default "6.3.13" if BR2_KERNEL_HEADERS_6_3 default "6.4.4" if BR2_KERNEL_HEADERS_6_4 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL