瀏覽代碼

package/linux-headers: drop 5.4.x option

The 5.4.x series is now EOL upstream, so drop the linux-headers
option and add legacy handling for it.

Bump kernel version in test_zfs.py.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
Bernd Kuhls 1 月之前
父節點
當前提交
7c9d6018e6
共有 4 個文件被更改,包括 8 次插入9 次删除
  1. 7 0
      Config.in.legacy
  2. 0 1
      linux/linux.hash
  3. 0 7
      package/linux-headers/Config.in.host
  4. 1 1
      support/testing/tests/package/test_zfs.py

+ 7 - 0
Config.in.legacy

@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2025.11"
 
+config BR2_KERNEL_HEADERS_5_4
+	bool "kernel headers version 5.4.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 5.4.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
 config BR2_PACKAGE_LIBARGTABLE2
 	bool "libargtable2 has been removed"
 	select BR2_LEGACY

+ 0 - 1
linux/linux.hash

@@ -7,7 +7,6 @@ sha256  1f207ebe93980829ecc0a18b694816f22b715e9893767731651969a168342b9e  linux-
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
 sha256  fd218df8e2107a4443b6c29fef7f95aad167031e0fbdbc7a858ae8471360668a  linux-5.15.197.tar.xz
 sha256  70c8b87ba1fcd8bfa663661934dc9bda92d0b5f3c0fc3197bb56399f69d9fe0c  linux-5.10.247.tar.xz
-sha256  ae6a3207f12aa4d6cfb0fa793ec9da4a6fcdfdcb57d869d63d6b77e3a8c1423d  linux-5.4.302.tar.xz
 # Locally computed
 sha256  fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae  linux-cip-5.10.162-cip24.tar.gz
 sha256  b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441  linux-cip-5.10.162-cip24-rt10.tar.gz

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

@@ -24,12 +24,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL
 	depends on BR2_LINUX_KERNEL
 	select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION
 
-config BR2_KERNEL_HEADERS_5_4
-	bool "Linux 5.4.x kernel headers"
-	# Support was introduced in Linux 5.19
-	depends on !BR2_loongarch64
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
-
 config BR2_KERNEL_HEADERS_5_10
 	bool "Linux 5.10.x kernel headers"
 	# Support was introduced in Linux 5.19
@@ -466,7 +460,6 @@ endchoice
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "5.4.302"	if BR2_KERNEL_HEADERS_5_4
 	default "5.10.247"	if BR2_KERNEL_HEADERS_5_10
 	default "5.15.197"	if BR2_KERNEL_HEADERS_5_15
 	default "6.1.159"	if BR2_KERNEL_HEADERS_6_1

+ 1 - 1
support/testing/tests/package/test_zfs.py

@@ -81,7 +81,7 @@ class TestZfsUclibc(TestZfsBase):
     config = config.replace('BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y\n', '') + \
         """
         BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y
-        BR2_KERNEL_HEADERS_5_4=y
+        BR2_KERNEL_HEADERS_5_10=y
         BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
         BR2_PTHREAD_DEBUG=y
         BR2_TOOLCHAIN_BUILDROOT_CXX=y