linux-headers: remove deprecated version 4.2 and 4.3

We will remove BR2_DEPRECATED, so remove this deprecated package.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/Config.in.legacy b/Config.in.legacy
index 5e65d7b0f85d88f1b4336a7af7b41cf4410e7d03..76365e6f72da58c58f8f44dc6a22dd576f226051 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,26 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2016.11"
 
+config BR2_KERNEL_HEADERS_4_3
+       bool "kernel headers version 4.3.x are no longer supported"
+       select BR2_KERNEL_HEADERS_4_1
+       select BR2_LEGACY
+       help
+         Version 4.3.x of the Linux kernel headers are no longer
+         maintained upstream and are now removed. As an alternative,
+         version 4.1.x of the headers have been automatically
+         selected in your configuration.
+
+config BR2_KERNEL_HEADERS_4_2
+       bool "kernel headers version 4.2.x are no longer supported"
+       select BR2_KERNEL_HEADERS_4_1
+       select BR2_LEGACY
+       help
+         Version 4.2.x of the Linux kernel headers are no longer
+         maintained upstream and are now removed. As an alternative,
+         version 4.1.x of the headers have been automatically
+         selected in your configuration.
+
 config BR2_PACKAGE_KODI_ADDON_XVDR
        bool "kodi-addon-xvdr removed"
        select BR2_LEGACY

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index ebb869ba69ef903ccbb04fd82ad18365aac5c526..60578b8fc8c3b684f615bc5b9ae3b048f02fe008 100644 (file)
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -60,16 +60,6 @@ choice
                bool "Linux 4.1.x kernel headers"
                select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
 
-       config BR2_KERNEL_HEADERS_4_2
-               bool "Linux 4.2.x kernel headers"
-               depends on BR2_DEPRECATED_SINCE_2016_02
-               select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2
-
-       config BR2_KERNEL_HEADERS_4_3
-               bool "Linux 4.3.x kernel headers"
-               depends on BR2_DEPRECATED_SINCE_2016_05
-               select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3
-
        config BR2_KERNEL_HEADERS_4_4
                bool "Linux 4.4.x kernel headers"
                select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
@@ -242,8 +232,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
        default "3.19.8"        if BR2_KERNEL_HEADERS_3_19
        default "4.0.9"         if BR2_KERNEL_HEADERS_4_0
        default "4.1.34"        if BR2_KERNEL_HEADERS_4_1
-       default "4.2.8"         if BR2_KERNEL_HEADERS_4_2
-       default "4.3.6"         if BR2_KERNEL_HEADERS_4_3
        default "4.4.24"        if BR2_KERNEL_HEADERS_4_4
        default "4.5.7"         if BR2_KERNEL_HEADERS_4_5
        default "4.6.7"         if BR2_KERNEL_HEADERS_4_6