From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 7 Sep 2018 11:08:31 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=721e4cbb529d247c9c1ebef68275e70a3086ae0b;p=buildroot.git

Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

721e4cbb529d247c9c1ebef68275e70a3086ae0b
diff --cc DEVELOPERS
index 2a5c8dc786,826831c5e7..3ba03df153
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@@ -693,7 -719,7 +719,8 @@@ F:	package/alljoyn-tcl
  F:	package/alljoyn-tcl-base/
  F:	package/boinc/
  F:	package/cairo/
+ F:	package/duktape/
 +F:	package/expat/
  F:	package/flatbuffers/
  F:	package/gtksourceview/
  F:	package/gssdp/
diff --cc linux/Config.in
index 69042af168,9ad11f1e39..0c05e8bdcd
--- a/linux/Config.in
+++ b/linux/Config.in
@@@ -30,10 -30,10 +30,10 @@@ choic
  	prompt "Kernel version"
  
  config BR2_LINUX_KERNEL_LATEST_VERSION
- 	bool "Latest version (4.17)"
+ 	bool "Latest version (4.18)"
  
  config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 -	bool "Latest CIP SLTS version (v4.4.130-cip23)"
 +	bool "Latest CIP SLTS version (v4.4.138-cip25)"
  	help
  	  CIP launched in the spring of 2016 to address the needs of
  	  organizations in industries such as power generation and
@@@ -120,8 -120,8 +120,8 @@@ endi
  
  config BR2_LINUX_KERNEL_VERSION
  	string
- 	default "4.17.19" if BR2_LINUX_KERNEL_LATEST_VERSION
+ 	default "4.18.5" if BR2_LINUX_KERNEL_LATEST_VERSION
 -	default "v4.4.130-cip23" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 +	default "v4.4.138-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
  	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
  		if BR2_LINUX_KERNEL_CUSTOM_VERSION
  	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
diff --cc package/linux-headers/Config.in.host
index 132cf6aecc,ee3b033be3..c2c0443af2
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@@ -75,16 -55,12 +55,20 @@@ config BR2_KERNEL_HEADERS_4_1
  	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
 +	  This option allows you to use a specific official version from
 +	  kernel.org, like 2.6.x, 2.6.x.y, 3.x.y, ...
 +
 +	  Note: you cannot use this option to select a _longterm_ 2.6
 +	  kernel, because these kernels are not located at the standard
 +	  URL at kernel.org. Instead, select "Custom tarball" and
 +	  specify the right URL directly.
  
  endchoice
  
@@@ -266,14 -246,10 +254,9 @@@ config BR2_DEFAULT_KERNEL_HEADER
  	string
  	default "3.2.102"	if BR2_KERNEL_HEADERS_3_2
  	default "4.1.52"	if BR2_KERNEL_HEADERS_4_1
 -	default "4.4.151"	if BR2_KERNEL_HEADERS_4_4
 -	default "4.9.123"	if BR2_KERNEL_HEADERS_4_9
 -	default "4.14.66"	if BR2_KERNEL_HEADERS_4_14
 +	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.17.18"	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