summaryrefslogtreecommitdiffstats
path: root/package/linux-headers
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2018-09-07 13:08:31 +0200
committerPeter Korsgaard <peter@korsgaard.com>2018-09-07 13:13:17 +0200
commit721e4cbb529d247c9c1ebef68275e70a3086ae0b (patch)
tree2967ef4e10e2592661f664df4515d67dbc80cfe5 /package/linux-headers
parent89920e9735cb561dccf1e1f81d35788fd10a655b (diff)
parentcec266ee1f708f11cc679cb4f81613fa4186003c (diff)
downloadbuildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.tar.gz
buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.zip
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/linux-headers')
-rw-r--r--package/linux-headers/Config.in.host37
1 files changed, 10 insertions, 27 deletions
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 132cf6aecc..c2c0443af2 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
choice
prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
- default BR2_KERNEL_HEADERS_4_17
+ default BR2_KERNEL_HEADERS_4_18
help
Select the kernel version to get headers from.
@@ -43,30 +43,10 @@ config BR2_KERNEL_HEADERS_4_9
bool "Linux 4.9.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
-config BR2_KERNEL_HEADERS_4_10
- bool "Linux 4.10.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
-
-config BR2_KERNEL_HEADERS_4_11
- bool "Linux 4.11.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
-
-config BR2_KERNEL_HEADERS_4_12
- bool "Linux 4.12.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
-
-config BR2_KERNEL_HEADERS_4_13
- bool "Linux 4.13.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
-
config BR2_KERNEL_HEADERS_4_14
bool "Linux 4.14.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
-config BR2_KERNEL_HEADERS_4_15
- bool "Linux 4.15.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
-
config BR2_KERNEL_HEADERS_4_16
bool "Linux 4.16.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
@@ -75,6 +55,10 @@ config BR2_KERNEL_HEADERS_4_17
bool "Linux 4.17.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
+config BR2_KERNEL_HEADERS_4_18
+ bool "Linux 4.18.x kernel headers"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
+
config BR2_KERNEL_HEADERS_VERSION
bool "Manually specified Linux version"
help
@@ -105,6 +89,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_18
+ bool "4.18.x"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
+
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17
bool "4.17.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
@@ -268,12 +256,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "4.1.52" if BR2_KERNEL_HEADERS_4_1
default "4.4.154" if BR2_KERNEL_HEADERS_4_4
default "4.9.125" if BR2_KERNEL_HEADERS_4_9
- default "4.10.17" if BR2_KERNEL_HEADERS_4_10
- default "4.11.12" if BR2_KERNEL_HEADERS_4_11
- default "4.12.14" if BR2_KERNEL_HEADERS_4_12
- default "4.13.16" if BR2_KERNEL_HEADERS_4_13
default "4.14.68" if BR2_KERNEL_HEADERS_4_14
- default "4.15.18" if BR2_KERNEL_HEADERS_4_15
default "4.16.18" if BR2_KERNEL_HEADERS_4_16
- default "4.17.19" if BR2_KERNEL_HEADERS_4_17
+ default "4.18.5" if BR2_KERNEL_HEADERS_4_18
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
OpenPOWER on IntegriCloud