[Buildroot] [git commit] {linux, linux-headers}: add version 5.7
From: Yann E. MORIN <hidden>
Date: 2020-06-05 20:52:21
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=7592cc4ad2e2444f45ddc7edbf3ea021a0c31878 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Walle <redacted> Signed-off-by: Yann E. MORIN <redacted> --- linux/Config.in | 4 ++-- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 5 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index 60dd6a5d69..f85d72068c 100644
--- a/linux/Config.in
+++ b/linux/Config.in@@ -27,7 +27,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (5.6)" + bool "Latest version (5.7)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (4.19.118-cip25)"
@@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.6.15" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.7" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.118-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.115-cip24-rt9" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
diff --git a/linux/linux.hash b/linux/linux.hash
index 629c355ad7..6462de8465 100644
--- a/linux/linux.hash
+++ b/linux/linux.hash@@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256 de8163bb62f822d84f7a3983574ec460060bf013a78ff79cd7c979ff1ec1d7e0 linux-5.7.tar.xz sha256 65ab799393d490463c610270634874dfcb66440a312837d04b51bbb69323034e linux-5.6.15.tar.xz sha256 1448334371fb52f511255726832464d33877a210a7350260fb18eb225ae211eb linux-5.5.19.tar.xz sha256 2667b90a42d42557aca9e3d37bba1b4e71809b9523958e6870ada311c4790744 linux-5.4.43.tar.xz
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 53ea3984eb..2982f6374e 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_5_6 + default BR2_KERNEL_HEADERS_5_7 help Select the kernel version to get headers from.
@@ -63,6 +63,10 @@ config BR2_KERNEL_HEADERS_5_6 bool "Linux 5.6.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 +config BR2_KERNEL_HEADERS_5_7 + bool "Linux 5.7.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" help
@@ -135,8 +139,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7 + bool "5.7.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6 - bool "5.6.x or later" + bool "5.6.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5
@@ -341,6 +349,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.43" if BR2_KERNEL_HEADERS_5_4 default "5.5.19" if BR2_KERNEL_HEADERS_5_5 default "5.6.15" if BR2_KERNEL_HEADERS_5_6 + default "5.7" if BR2_KERNEL_HEADERS_5_7 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 \
diff --git a/toolchain/Config.in b/toolchain/Config.in
index b6bcde4a95..6865199ffc 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in@@ -476,6 +476,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that
@@ -489,6 +493,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "5.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 default "5.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 default "5.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 default "5.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index 9a8078d314..a4430f7169 100644
--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options@@ -115,8 +115,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_7 + bool "5.7.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_6 - bool "5.6.x or later" + bool "5.6.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5