diff mbox series

[2/2] package/linux-headers: drop 6.7.x option

Message ID 20240411174435.2499446-2-bernd@kuhls.net
State Superseded
Headers show
Series [1/2] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 7, 8}.x series | expand

Commit Message

Bernd Kuhls April 11, 2024, 5:44 p.m. UTC 
The 6.7.x series is now EOL upstream, so drop the linux-headers option
and add legacy handling for it.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 Config.in.legacy                     | 7 +++++++
 linux/linux.hash                     | 1 -
 package/linux-headers/Config.in.host | 5 -----
 3 files changed, 7 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/Config.in.legacy b/Config.in.legacy
index 76af1da348..98a4125f4b 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@  endif
 
 comment "Legacy options removed in 2024.05"
 
+config BR2_KERNEL_HEADERS_6_7
+	bool "kernel headers version 6.7.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 6.7.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
 config BR2_TARGET_TI_K3_IMAGE_GEN
 	bool "ti-k3-image-gen removed"
 	select BR2_LEGACY
diff --git a/linux/linux.hash b/linux/linux.hash
index e382ba48e7..0c77282fa6 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  138923e5d73748b4bdbe9b5a0b8f36dfac9fcc16753a9222928dc6c963effa89  linux-6.8.5.tar.xz
-sha256  6c2979e3948806a0dbacba193f8453ea42c179c1eb9f6136e3c35d87e5707984  linux-6.7.12.tar.xz
 sha256  af54b449f4fb93b8e8daa346144a7309e8e95174bd962c4b5917cf56120456d9  linux-6.6.26.tar.xz
 sha256  33fe9bcc597c60021a2b2abacd4e0f6f546200ab99594c9a07ad600258b86274  linux-6.1.85.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 0091afd39c..9b75375879 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_7
-	bool "Linux 6.7.x kernel headers"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
-
 config BR2_KERNEL_HEADERS_6_8
 	bool "Linux 6.8.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
@@ -425,7 +421,6 @@  config BR2_DEFAULT_KERNEL_HEADERS
 	default "5.15.154"	if BR2_KERNEL_HEADERS_5_15
 	default "6.1.85"	if BR2_KERNEL_HEADERS_6_1
 	default "6.6.26"	if BR2_KERNEL_HEADERS_6_6
-	default "6.7.12"	if BR2_KERNEL_HEADERS_6_7
 	default "6.8.5"		if BR2_KERNEL_HEADERS_6_8
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL