From 5cc46a07220091afb23228adf4bebb6dee39b64a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 4 May 2022 10:21:56 +0200 Subject: [PATCH] package/linux-headers: drop 4.4.x option The 4.4.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 7 ------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 6d2c82ab7f..806e995bd1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2022.05" +config BR2_KERNEL_HEADERS_4_4 + bool "kernel headers version 4.4.x are no longer supported" + select BR2_LEGACY + help + Version 4.4.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_BINUTILS_VERSION_2_32_X bool "binutils 2.32.x has been removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 077bc4d4d7..7a3308546f 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -4,7 +4,6 @@ sha256 18bf091a2157faa8d92a1aba2ecb66b5124bb0e033fc7797343984e069a2c026 linux- sha256 82516a02bb52456f6e8057217dde6e02b78003b1e058117557c2ae9661696dfc linux-5.10.113.tar.xz sha256 288ca85fcdad18e950ccbe3d640594ee36d5aac226321ed935076fadb0cc0a3a linux-5.4.191.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz sha256 fa2fb1fb5ba2e6ed99603063474804bd5fddeb8a5ad769d47786f82109e5c627 linux-4.9.312.tar.xz sha256 e3dcacc2459c91586ae94121f54eb54a7cae9c424766fe20498169f682fd1b15 linux-4.14.277.tar.xz sha256 4c6269d3c14e593151b035a55227110e632642d848032ef6992135c18488fe13 linux-4.19.241.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 229c5a0ca8..b030996dff 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -27,12 +27,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_4_4 - bool "Linux 4.4.x kernel headers" - depends on !BR2_riscv - depends on !BR2_csky - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 - config BR2_KERNEL_HEADERS_4_9 bool "Linux 4.9.x kernel headers" depends on !BR2_riscv @@ -381,7 +375,6 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.302" if BR2_KERNEL_HEADERS_4_4 default "4.9.312" if BR2_KERNEL_HEADERS_4_9 default "4.14.277" if BR2_KERNEL_HEADERS_4_14 default "4.19.241" if BR2_KERNEL_HEADERS_4_19