Browse Source

package/linux-headers: drop 4.14.x option

The 4.14.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: Peter Korsgaard <peter@korsgaard.com>
Bernd Kuhls 1 year ago
parent
commit
a959e1baab
3 changed files with 7 additions and 7 deletions
  1. 7 0
      Config.in.legacy
  2. 0 1
      linux/linux.hash
  3. 0 6
      package/linux-headers/Config.in.host

+ 7 - 0
Config.in.legacy

@@ -146,6 +146,13 @@ endif
 
 
 comment "Legacy options removed in 2024.02"
 comment "Legacy options removed in 2024.02"
 
 
+config BR2_KERNEL_HEADERS_4_14
+	bool "kernel headers version 4.14.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 4.14.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
 config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI
 config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI
 	bool "libcamera pipeline 'raspberrypi' was renamed to 'rpi/vc4'"
 	bool "libcamera pipeline 'raspberrypi' was renamed to 'rpi/vc4'"
 	depends on BR2_arm || BR2_aarch64
 	depends on BR2_arm || BR2_aarch64

+ 0 - 1
linux/linux.hash

@@ -7,7 +7,6 @@ sha256  86ace9892296bf1534d574894edd27614b68de4085c03fd3f60121751a334f1b  linux-
 sha256  da072f7e6fe719c01e517cac1fa9988b2f5fa87d62a8501b7dc16d3b62b2acb6  linux-5.4.266.tar.xz
 sha256  da072f7e6fe719c01e517cac1fa9988b2f5fa87d62a8501b7dc16d3b62b2acb6  linux-5.4.266.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
 sha256  cdc6a5d51aaff7c50bfe4ac4adf5cc3727043a24641145dc268e858db2a4b598  linux-4.19.304.tar.xz
 sha256  cdc6a5d51aaff7c50bfe4ac4adf5cc3727043a24641145dc268e858db2a4b598  linux-4.19.304.tar.xz
-sha256  0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c  linux-4.14.336.tar.xz
 # Locally computed
 # Locally computed
 sha256  fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae  linux-cip-5.10.162-cip24.tar.gz
 sha256  fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae  linux-cip-5.10.162-cip24.tar.gz
 sha256  b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441  linux-cip-5.10.162-cip24-rt10.tar.gz
 sha256  b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441  linux-cip-5.10.162-cip24-rt10.tar.gz

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

@@ -24,11 +24,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL
 	depends on BR2_LINUX_KERNEL
 	depends on BR2_LINUX_KERNEL
 	select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION
 	select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION
 
 
-config BR2_KERNEL_HEADERS_4_14
-	bool "Linux 4.14.x kernel headers"
-	depends on !BR2_riscv
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
-
 config BR2_KERNEL_HEADERS_4_19
 config BR2_KERNEL_HEADERS_4_19
 	bool "Linux 4.19.x kernel headers"
 	bool "Linux 4.19.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
@@ -408,7 +403,6 @@ endchoice
 
 
 config BR2_DEFAULT_KERNEL_HEADERS
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
 	string
-	default "4.14.336"	if BR2_KERNEL_HEADERS_4_14
 	default "4.19.304"	if BR2_KERNEL_HEADERS_4_19
 	default "4.19.304"	if BR2_KERNEL_HEADERS_4_19
 	default "5.4.266"	if BR2_KERNEL_HEADERS_5_4
 	default "5.4.266"	if BR2_KERNEL_HEADERS_5_4
 	default "5.10.207"	if BR2_KERNEL_HEADERS_5_10
 	default "5.10.207"	if BR2_KERNEL_HEADERS_5_10