[Buildroot] [PATCH 1/3] linux-headers: bump to 4.12 kernel version

[Buildroot] [PATCH 1/3] linux-headers: bump to 4.12 kernel version

[Joel Stanley]

Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 package/linux-headers/Config.in.host | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index be0799bc5ddb..ab49b6087cd0 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_11
+	default BR2_KERNEL_HEADERS_4_12
 	help
 	  Select the kernel version to get headers from.
 
@@ -66,6 +66,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_VERSION
 	bool "Manually specified Linux version"
 
@@ -87,6 +91,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_12
+	bool "4.12.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11
 	bool "4.11.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
@@ -231,4 +239,5 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "4.9.36"	if BR2_KERNEL_HEADERS_4_9
 	default "4.10.17"	if BR2_KERNEL_HEADERS_4_10
 	default "4.11.9"	if BR2_KERNEL_HEADERS_4_11
+	default "4.12"		if BR2_KERNEL_HEADERS_4_12
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
-- 
2.13.2

[Buildroot] [PATCH 2/3] toolchain: add 4.12.x choice for headers

[Joel Stanley]

Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 toolchain/toolchain-common.in                                        | 5 +++++
 .../toolchain-external/toolchain-external-custom/Config.in.options   | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index c570cc848eb0..932eecac9ab4 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -245,10 +245,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
 
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
+
 # This order guarantees that the highest version is set, as kconfig
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
 	string
+	default "4.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
 	default "4.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
 	default "4.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
 	default "4.9"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index d1b76c32ac31..ae343ddad557 100644
--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
@@ -93,6 +93,10 @@ choice
 	    m = ( LINUX_VERSION_CODE >> 8  ) & 0xFF
 	    p = ( LINUX_VERSION_CODE >> 0  ) & 0xFF
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12
+	bool "4.12.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_11
 	bool "4.11.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
-- 
2.13.2

[Buildroot] [PATCH 3/3] linux: bump default to version 4.12

[Joel Stanley]

Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index c110384a973a..c9dadcd0967b 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -26,7 +26,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "Latest version (4.11.9)"
+	bool "Latest version (4.12)"
 
 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	bool "Latest CIP SLTS version (v4.4.55-cip3)"
@@ -116,7 +116,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "4.11.9" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "4.12" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "v4.4.55-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
-- 
2.13.2

[Buildroot] [PATCH 1/3] linux-headers: bump to 4.12 kernel version

[Peter Korsgaard]

>>>>> "Joel" == Joel Stanley <joel@jms.id.au> writes:

 > Signed-off-by: Joel Stanley <joel@jms.id.au>

Patch 1 depends on patch 2, so I've reordered the series and committed,
thanks.

-- 
Bye, Peter Korsgaard