[Buildroot] [PATCH 0/3] Linux 4.20 addition

[Buildroot] [PATCH 0/3] Linux 4.20 addition

[Thomas Petazzoni]

Hello,

This adds support for using Linux 4.20 for the kernel headers and/or
kernel build.

Amongst other things, Linux 4.20 has the fix of the net_tstamp.h
header which will fix the build failure of linuxptp.

Thanks,

Thomas

Thomas Petazzoni (3):
  toolchain: add necessary options to support 4.20 kernel headers
  package/linux-headers: add support for Linux 4.20 kernel headers
  linux: add support for Linux 4.20

 linux/Config.in                      |  4 ++--
 linux/linux.hash                     |  1 +
 package/linux-headers/Config.in.host | 11 ++++++++++-
 toolchain/Config.in                  |  5 +++++
 4 files changed, 18 insertions(+), 3 deletions(-)

-- 
2.20.1

[Buildroot] [PATCH 1/3] toolchain: add necessary options to support 4.20 kernel headers

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 toolchain/Config.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index bf8ed5bf5b..baf192c936 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -370,10 +370,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
 
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
+
 # 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.20" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
 	default "4.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
 	default "4.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
 	default "4.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
-- 
2.20.1

[Buildroot] [PATCH 2/3] package/linux-headers: add support for Linux 4.20 kernel headers

[Thomas Petazzoni]

We need to update linux/linux.hash as part of this commit, because
package/linux-headers/linux-headers.hash is a symlink to
linux/linux.hash.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 linux/linux.hash                     |  1 +
 package/linux-headers/Config.in.host | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/linux/linux.hash b/linux/linux.hash
index 693605d3ec..adc133495c 100644
--- a/linux/linux.hash
+++ b/linux/linux.hash
@@ -1,4 +1,5 @@
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
+sha256 ad0823183522e743972382df0aa08fb5ae3077f662b125f1e599b0b2aaa12438  linux-4.20.tar.xz
 sha256 84d7aa436e10690b53165b9d59ec20548e6a4ce3324b135c5019fb0f7dd2a2d2  linux-4.19.7.tar.xz
 sha256 68ac319e0fb7edd6b6051541d9cf112cd4f77a29e16a69ae1e133ff51117f653  linux-4.18.20.tar.xz
 sha256 41026d713ba4f7a5e9d514b876ce4ed28a1d993c0c58b42b2a2597d6a0e83021  linux-4.16.18.tar.xz
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 1d66759ac9..3c43bc8536 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_19
+	default BR2_KERNEL_HEADERS_4_20
 	help
 	  Select the kernel version to get headers from.
 
@@ -64,6 +64,10 @@ config BR2_KERNEL_HEADERS_4_19
 	bool "Linux 4.19.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
 
+config BR2_KERNEL_HEADERS_4_20
+	bool "Linux 4.20.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
+
 config BR2_KERNEL_HEADERS_VERSION
 	bool "Manually specified Linux version"
 	help
@@ -129,6 +133,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_20
+	bool "4.20.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19
 	bool "4.19.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
@@ -304,6 +312,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "4.16.18"	if BR2_KERNEL_HEADERS_4_16
 	default "4.18.20"	if BR2_KERNEL_HEADERS_4_18
 	default "4.19.7"	if BR2_KERNEL_HEADERS_4_19
+	default "4.20"		if BR2_KERNEL_HEADERS_4_20
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
 	default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
-- 
2.20.1

[Buildroot] [PATCH 3/3] linux: add support for Linux 4.20

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 5c074d3d98..9a4d46e534 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -30,7 +30,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "Latest version (4.19)"
+	bool "Latest version (4.20)"
 
 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	bool "Latest CIP SLTS version (v4.4.154-cip28)"
@@ -120,7 +120,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "4.19.7" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "4.20" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "v4.4.154-cip28" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
-- 
2.20.1

[Buildroot] [PATCH 1/3] toolchain: add necessary options to support 4.20 kernel headers

[Romain Naour]

Hi Thomas,

Le 31/12/2018 ? 17:06, Thomas Petazzoni a ?crit?:
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> ---
>  toolchain/Config.in | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/toolchain/Config.in b/toolchain/Config.in
> index bf8ed5bf5b..baf192c936 100644
> --- a/toolchain/Config.in
> +++ b/toolchain/Config.in
> @@ -370,10 +370,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
>  	bool
>  	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
>  
> +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
> +	bool
> +	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
> +
>  # 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.20" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
>  	default "4.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
>  	default "4.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
>  	default "4.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
> 

It seems you forgot to add a new entry in toolchain-external-custom package

See:
https://git.buildroot.net/buildroot/commit/?id=561770fd032744b4daac186c1ede9bce1d4b4c45

Otherwise the rest of the series is ok

Best regards,
Romain

[Buildroot] [PATCH 1/3] toolchain: add necessary options to support 4.20 kernel headers

[Thomas Petazzoni]

Hello,

On Mon, 31 Dec 2018 18:21:02 +0100, Romain Naour wrote:

> It seems you forgot to add a new entry in toolchain-external-custom package
> 
> See:
> https://git.buildroot.net/buildroot/commit/?id=561770fd032744b4daac186c1ede9bce1d4b4c45

Thanks for the feedback, I have just sent a v2 with an additional patch
for this.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com