浏览代码

kernel headers: remove deprecated version 3.8

Kernel headers version 3.8.x has been deprecated since 2013.08 and thus can
be removed in 2014.08.
An automatic selection of 3.9.x headers is performed in the legacy menu.
Existing automatic selections of 3.8.x headers are modified to select
3.9.x.

As this patch removes the last occurrence of BR2_DEPRECATED_SINCE_2013_08,
the symbol is removed too.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Thomas De Schampheleire 11 年之前
父节点
当前提交
dfae6f6765
共有 3 个文件被更改,包括 13 次插入13 次删除
  1. 0 4
      Config.in
  2. 13 3
      Config.in.legacy
  3. 0 6
      package/linux-headers/Config.in.host

+ 0 - 4
Config.in

@@ -280,10 +280,6 @@ config BR2_DEPRECATED
 
 
 if BR2_DEPRECATED
 if BR2_DEPRECATED
 
 
-config BR2_DEPRECATED_SINCE_2013_08
-	bool
-	default y
-
 config BR2_DEPRECATED_SINCE_2013_11
 config BR2_DEPRECATED_SINCE_2013_11
 	bool
 	bool
 	default y
 	default y

+ 13 - 3
Config.in.legacy

@@ -101,6 +101,16 @@ endif
 ###############################################################################
 ###############################################################################
 comment "Legacy options removed in 2014.08"
 comment "Legacy options removed in 2014.08"
 
 
+config BR2_KERNEL_HEADERS_3_8
+	bool "kernel headers version 3.8.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_9
+	select BR2_LEGACY
+	help
+	  Version 3.8.x of the Linux kernel headers have been deprecated
+	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.9.x of the headers have been
+	  automatically selected in your configuration.
+
 config BR2_PACKAGE_GETTEXT_TOOLS
 config BR2_PACKAGE_GETTEXT_TOOLS
 	bool "support for gettext-tools on target has been removed"
 	bool "support for gettext-tools on target has been removed"
 	select BR2_LEGACY
 	select BR2_LEGACY
@@ -131,7 +141,7 @@ config BR2_PACKAGE_EVTEST_CAPTURE
 
 
 config BR2_KERNEL_HEADERS_3_6
 config BR2_KERNEL_HEADERS_3_6
 	bool "kernel headers version 3.6.x are no longer supported"
 	bool "kernel headers version 3.6.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_8
+	select BR2_KERNEL_HEADERS_3_9
 	select BR2_LEGACY
 	select BR2_LEGACY
 	help
 	help
 	  Version 3.6.x of the Linux kernel headers have been deprecated
 	  Version 3.6.x of the Linux kernel headers have been deprecated
@@ -141,7 +151,7 @@ config BR2_KERNEL_HEADERS_3_6
 
 
 config BR2_KERNEL_HEADERS_3_7
 config BR2_KERNEL_HEADERS_3_7
 	bool "kernel headers version 3.7.x are no longer supported"
 	bool "kernel headers version 3.7.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_8
+	select BR2_KERNEL_HEADERS_3_9
 	select BR2_LEGACY
 	select BR2_LEGACY
 	help
 	help
 	  Version 3.7.x of the Linux kernel headers have been deprecated
 	  Version 3.7.x of the Linux kernel headers have been deprecated
@@ -326,7 +336,7 @@ config BR2_KERNEL_HEADERS_3_3
 
 
 config BR2_KERNEL_HEADERS_3_5
 config BR2_KERNEL_HEADERS_3_5
 	bool "kernel headers version 3.5.x are no longer supported"
 	bool "kernel headers version 3.5.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_8
+	select BR2_KERNEL_HEADERS_3_9
 	select BR2_LEGACY
 	select BR2_LEGACY
 	help
 	help
 	  Version 3.5.x of the Linux kernel headers have been deprecated
 	  Version 3.5.x of the Linux kernel headers have been deprecated

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

@@ -26,11 +26,6 @@ choice
 		depends on !BR2_arc
 		depends on !BR2_arc
 		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
 		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
 
 
-	config BR2_KERNEL_HEADERS_3_8
-		bool "Linux 3.8.x kernel headers"
-		depends on BR2_DEPRECATED_SINCE_2013_08 && !BR2_arc
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8
-
 	config BR2_KERNEL_HEADERS_3_9
 	config BR2_KERNEL_HEADERS_3_9
 		bool "Linux 3.9.x kernel headers"
 		bool "Linux 3.9.x kernel headers"
 		depends on BR2_DEPRECATED_SINCE_2013_11
 		depends on BR2_DEPRECATED_SINCE_2013_11
@@ -155,7 +150,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.0.101"	if BR2_KERNEL_HEADERS_3_0
 	default "3.0.101"	if BR2_KERNEL_HEADERS_3_0
 	default "3.2.60"	if BR2_KERNEL_HEADERS_3_2
 	default "3.2.60"	if BR2_KERNEL_HEADERS_3_2
 	default "3.4.93"	if BR2_KERNEL_HEADERS_3_4
 	default "3.4.93"	if BR2_KERNEL_HEADERS_3_4
-	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
 	default "3.10.43"	if BR2_KERNEL_HEADERS_3_10
 	default "3.10.43"	if BR2_KERNEL_HEADERS_3_10
 	default "3.11.10"	if BR2_KERNEL_HEADERS_3_11
 	default "3.11.10"	if BR2_KERNEL_HEADERS_3_11