Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2016-06-01 17:55:16 +02:00
314 changed files with 3530 additions and 5099 deletions

View File

@@ -6,7 +6,7 @@ comment "Kernel Header Options"
choice
prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
default BR2_KERNEL_HEADERS_4_5
default BR2_KERNEL_HEADERS_4_6
help
Select the version of kernel header files you wish to use.
You must select the correct set of header files to match
@@ -78,6 +78,10 @@ choice
bool "Linux 4.5.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5
config BR2_KERNEL_HEADERS_4_6
bool "Linux 4.6.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
config BR2_KERNEL_HEADERS_VERSION
bool "Manually specified Linux version"
endchoice
@@ -99,6 +103,10 @@ choice
This is used to hide/show some packages that have strict
requirements on the version of kernel headers.
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6
bool "4.6.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_5
bool "4.5.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5
@@ -223,4 +231,5 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "4.3.6" if BR2_KERNEL_HEADERS_4_3
default "4.4.11" if BR2_KERNEL_HEADERS_4_4
default "4.5.5" if BR2_KERNEL_HEADERS_4_5
default "4.6" if BR2_KERNEL_HEADERS_4_6
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION