浏览代码

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 <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Bernd Kuhls 9 月之前
父节点
当前提交
3e92a39db5
共有 3 个文件被更改,包括 7 次插入6 次删除
  1. 7 0
      Config.in.legacy
  2. 0 1
      linux/linux.hash
  3. 0 5
      package/linux-headers/Config.in.host

+ 7 - 0
Config.in.legacy

@@ -146,6 +146,13 @@ endif
 
 
 comment "Legacy options removed in 2024.11"
 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
 config BR2_PACKAGE_IPMITOOL_PEN_REG_URI
 	string "IANA PEN registry moved to iana-assignment package"
 	string "IANA PEN registry moved to iana-assignment package"
 	help
 	help

+ 0 - 1
linux/linux.hash

@@ -1,6 +1,5 @@
 # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
 # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
 sha256  057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73  linux-6.11.3.tar.xz
 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  f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95  linux-6.6.56.tar.xz
 sha256  8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24  linux-6.1.112.tar.xz
 sha256  8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24  linux-6.1.112.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc

+ 0 - 5
package/linux-headers/Config.in.host

@@ -48,10 +48,6 @@ config BR2_KERNEL_HEADERS_6_6
 	bool "Linux 6.6.x kernel headers"
 	bool "Linux 6.6.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
 	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
 config BR2_KERNEL_HEADERS_6_11
 	bool "Linux 6.11.x kernel headers"
 	bool "Linux 6.11.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
 	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 "5.15.167"	if BR2_KERNEL_HEADERS_5_15
 	default "6.1.112"	if BR2_KERNEL_HEADERS_6_1
 	default "6.1.112"	if BR2_KERNEL_HEADERS_6_1
 	default "6.6.56"	if BR2_KERNEL_HEADERS_6_6
 	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 "6.11.3"	if BR2_KERNEL_HEADERS_6_11
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL