From 3e92a39db573c6bc99a9b2c4fa0049d12eb55512 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 13 Oct 2024 12:33:41 +0200 Subject: [PATCH] package/linux-headers: drop 6.10.x option The 6.10.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 6a1518f439..4a47a2dda1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.11" +config BR2_KERNEL_HEADERS_6_10 + bool "kernel headers version 6.10.x are no longer supported" + select BR2_LEGACY + help + Version 6.10.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_IPMITOOL_PEN_REG_URI string "IANA PEN registry moved to iana-assignment package" help diff --git a/linux/linux.hash b/linux/linux.hash index 32e1be4091..5233de2b0b 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 057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73 linux-6.11.3.tar.xz -sha256 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e linux-6.10.14.tar.xz sha256 f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 linux-6.6.56.tar.xz sha256 8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24 linux-6.1.112.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a3610d7ecd..7c1611699c 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -48,10 +48,6 @@ config BR2_KERNEL_HEADERS_6_6 bool "Linux 6.6.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 -config BR2_KERNEL_HEADERS_6_10 - bool "Linux 6.10.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 - config BR2_KERNEL_HEADERS_6_11 bool "Linux 6.11.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 @@ -438,7 +434,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.167" if BR2_KERNEL_HEADERS_5_15 default "6.1.112" if BR2_KERNEL_HEADERS_6_1 default "6.6.56" if BR2_KERNEL_HEADERS_6_6 - default "6.10.14" if BR2_KERNEL_HEADERS_6_10 default "6.11.3" if BR2_KERNEL_HEADERS_6_11 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL