[Buildroot] [PATCH v2 0/4] Support Linux 4.20

[Buildroot] [PATCH v2 0/4] Support Linux 4.20

[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.

Changes since v1:

 - Add one more patch that makes it possible to use custom external
   toolchains that use Linux 4.20 kernel headers, as noticed by Romain
   Naour.

Thomas Petazzoni (4):
  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
  toolchain/toolchain-external-custom: support Linux 4.20 kernel headers

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

-- 
2.20.1

[Buildroot] [PATCH v2 1/4] 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 v2 2/4] 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 v2 3/4] 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 v2 4/4] toolchain/toolchain-external-custom: support Linux 4.20 kernel headers

[Thomas Petazzoni]

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

diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index 288fc3f3e0..08a79ee4d9 100644
--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
@@ -123,6 +123,10 @@ choice
 	    m = ( LINUX_VERSION_CODE >> 8  ) & 0xFF
 	    p = ( LINUX_VERSION_CODE >> 0  ) & 0xFF
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_20
+	bool "4.20.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19
 	bool "4.19.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
-- 
2.20.1

[Buildroot] [PATCH v2 0/4] Support Linux 4.20

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > 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.

 > Changes since v1:

 >  - Add one more patch that makes it possible to use custom external
 >    toolchains that use Linux 4.20 kernel headers, as noticed by Romain
 >    Naour.

 > Thomas Petazzoni (4):
 >   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
 >   toolchain/toolchain-external-custom: support Linux 4.20 kernel headers

Committed series, thanks.

With 2019.02 becoming our next LTS and 4.20 NOT a LTS release, I wonder
if it would make sense to still default to 4.19.x instead of 4.20.x?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v2 0/4] Support Linux 4.20

[Thomas Petazzoni]

Hello,

On Tue, 01 Jan 2019 22:58:44 +0100, Peter Korsgaard wrote:

> With 2019.02 becoming our next LTS and 4.20 NOT a LTS release, I wonder
> if it would make sense to still default to 4.19.x instead of 4.20.x?

Yes, that probably make sense. But in this case, we would need to get
in touch with the kernel folks to get the net_tstamp.h fix in -stable.
It has the Fixes: tag, but it still hasn't been backported to
4.19-stable.

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

[Buildroot] [PATCH v2 0/4] Support Linux 4.20

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > Hello,
 > On Tue, 01 Jan 2019 22:58:44 +0100, Peter Korsgaard wrote:

 >> With 2019.02 becoming our next LTS and 4.20 NOT a LTS release, I wonder
 >> if it would make sense to still default to 4.19.x instead of 4.20.x?

 > Yes, that probably make sense. But in this case, we would need to get
 > in touch with the kernel folks to get the net_tstamp.h fix in -stable.
 > It has the Fixes: tag, but it still hasn't been backported to
 > 4.19-stable.

Ok. The last few 4.19.x releases did not contain any net/ fixes, perhaps
that will fixed now the holidays are over.

If not, will you take care of it?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH v2 0/4] Support Linux 4.20

[Thomas Petazzoni]

Hello,

On Wed, 02 Jan 2019 12:31:14 +0100, Peter Korsgaard wrote:

>  > Yes, that probably make sense. But in this case, we would need to get
>  > in touch with the kernel folks to get the net_tstamp.h fix in -stable.
>  > It has the Fixes: tag, but it still hasn't been backported to
>  > 4.19-stable.  
> 
> Ok. The last few 4.19.x releases did not contain any net/ fixes, perhaps
> that will fixed now the holidays are over.

Ah, yes, it's true that for net/ stuff, having the Fixes: tag doesn't
automatically backport the patch, davem wants to have a manual look at
each and every net/ patch that goes into stable.

> If not, will you take care of it?

I looked up the e-mails archives, and on December 18, when davem
applied the patch, he said:

  Applied and queued up for -stable, thanks.

So I suppose it will land in stable at some point.

Best regards,

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

[Buildroot] [PATCH v2 0/4] Support Linux 4.20

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:
 >> Hello,
 >> On Tue, 01 Jan 2019 22:58:44 +0100, Peter Korsgaard wrote:

 >>> With 2019.02 becoming our next LTS and 4.20 NOT a LTS release, I wonder
 >>> if it would make sense to still default to 4.19.x instead of 4.20.x?

 >> Yes, that probably make sense. But in this case, we would need to get
 >> in touch with the kernel folks to get the net_tstamp.h fix in -stable.
 >> It has the Fixes: tag, but it still hasn't been backported to
 >> 4.19-stable.

 > Ok. The last few 4.19.x releases did not contain any net/ fixes, perhaps
 > that will fixed now the holidays are over.

This has indeed been fixed in 4.19.14. I have sent a patch to change our
default linux / linux-headers version back to 4.19.x:

https://patchwork.ozlabs.org/patch/1022974/

-- 
Bye, Peter Korsgaard