Skip to contentSkip to conversation

toolchain: add 4.16.x choice for headers

PATCH Superseded Bernd Kuhls 2 participants 5 messages Apr 2, 2018

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH v2 1/3 toolchain: add 4.16.x choice for headers

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: no changes

 toolchain/Config.in                                                  | 5 +++++
 .../toolchain-external/toolchain-external-custom/Config.in.options   | 4 ++++
 2 files changed, 9 insertions(+)
toolchain/Config.in +5 -0
index b33eaffd52..e2ef1e7ef3 100644
@@ -323,10 +323,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
 
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
+
 # 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.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
 	default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
 	default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
 	default "4.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
toolchain/toolchain-external/toolchain-external-custom/Config.in.options +4 -0
index 6c12b1619c..8cc9db6841 100644
@@ -108,6 +108,10 @@ choice
 	    m = ( LINUX_VERSION_CODE >> 8  ) & 0xFF
 	    p = ( LINUX_VERSION_CODE >> 0  ) & 0xFF
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16
+	bool "4.16.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_15
 	bool "4.15.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
Signature · 1 line
2.14.2
author
#1 lore raw

PATCH v2 2/3 linux-headers: bump to 4.16 kernel version

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: no changes

 package/linux-headers/Config.in.host | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
package/linux-headers/Config.in.host +10 -1
index 2a59e2902a..75f7966e51 100644
@@ -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_15
+	default BR2_KERNEL_HEADERS_4_16
 	help
 	  Select the kernel version to get headers from.
 

@@ -67,6 +67,10 @@ 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
+
 config BR2_KERNEL_HEADERS_VERSION
 	bool "Manually specified Linux version"
 

@@ -89,6 +93,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_16
+	bool "4.16.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15
 	bool "4.15.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15

@@ -250,4 +258,5 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "4.13.16"	if BR2_KERNEL_HEADERS_4_13
 	default "4.14.32"	if BR2_KERNEL_HEADERS_4_14
 	default "4.15.15"	if BR2_KERNEL_HEADERS_4_15
+	default "4.16"		if BR2_KERNEL_HEADERS_4_16
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
Signature · 1 line
2.14.2
author
#2 lore raw

PATCH 3/3 linux: bump default to version 4.16

In reply to Bernd Kuhls

Added host-bison and host-flex as dependencies after upstream removed pre-generated files and switched over to build-time generation, for details see

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=033dba2ec06c47a9fe1b190bc3281058fb20738d
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=29c833061c1d8c2d1d23a62e7061561eadd76cdb

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: added host-bison and host-flex as mandatory dependencies (Thomas)

 linux/Config.in | 4 ++--
 linux/linux.mk  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
linux/Config.in +2 -2
index d9c5b62863..d52af66e5c 100644
@@ -26,7 +26,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "Latest version (4.15)"
+	bool "Latest version (4.16)"
 
 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	bool "Latest CIP SLTS version (v4.4.112-cip18)"

@@ -116,7 +116,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "4.15.15" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "4.16" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
linux/linux.mk +1 -1
index 7609a15f23..9e646baffc 100644
@@ -62,7 +62,7 @@ LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
 LINUX_PATCH = $(filter ftp://% http://% https://%,$(LINUX_PATCHES))
 
 LINUX_INSTALL_IMAGES = YES
-LINUX_DEPENDENCIES += host-kmod
+LINUX_DEPENDENCIES += host-bison host-flex host-kmod
 
 # host tools needed for kernel compression
 ifeq ($(BR2_LINUX_KERNEL_LZ4),y)
Signature · 1 line
2.14.2
author
#3 lore raw

PATCH 3/3 linux: bump default to version 4.16

Am Mon, 02 Apr 2018 15:00:28 +0200 schrieb Bernd Kuhls:

Quoted 3 lines

Added host-bison and host-flex as dependencies after upstream removed pre-generated files and switched over to build-time generation, for details see

Hi,

I forgot to add "v2" to the subject of this patch...

Regards, Bernd

#4 lore raw

PATCH 3/3 linux: bump default to version 4.16

Hello,

Quoted 1 line · Bernd Kuhls

I forgot to add "v2" to the subject of this patch...

Do you manually adds those vX prefixes in the patches ?

Just in case you didn't know:

- git format-patch -v42

- git format-patch --subject-prefix="PATCH v42"

will automatically generate patches with titles starting with:

[PATCH v42 X/Y]

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com