toolchain/Config.in: move BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5
PATCH 1/3 toolchain/Config.in: move BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5
Config option was placed at the wrong position.
--- toolchain/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
toolchain/Config.in +4 -4
@@ -468,6 +468,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that
@@ -477,10 +481,6 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 config BR2_TOOLCHAIN_HEADERS_LATEST bool -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 - # 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
Signature · 1 line
2.25.0
PATCH 2/3 linux: fix option string for kernel 5.5.x
--- package/linux-headers/Config.in.host | 2 +- .../toolchain-external-custom/Config.in.options | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/linux-headers/Config.in.host +1 -1
@@ -132,7 +132,7 @@ choice in the choice, then select the latest version. config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5 - bool "5.5.x or later" + bool "5.5.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4
toolchain/toolchain-external/toolchain-external-custom/Config.in.options +1 -1
@@ -116,7 +116,7 @@ choice in the choice, then select the latest version. config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5 - bool "5.5.x or later" + bool "5.5.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4
Signature · 1 line
2.25.0
PATCH 2/3 linux: fix option string for kernel 5.5.x
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Signed-off-by Bernd Kuhls <[email protected]>--- package/linux-headers/Config.in.host | 2 +- .../toolchain-external-custom/Config.in.options | 2 +-
This change is not about linux?
package/linux-headers/Config.in.host choice · line 135
Quoted 12 lines
2 files changed, 2 insertions(+), 2 deletions(-)package/linux-headers/Config.in.host +1
-1@@ -132,7 +132,7 @@ choice in the choice, then select the latest version. config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5 - bool "5.5.x or later" + bool "5.5.x"
Why? We've used the .. or later text ever since:
commit 338e62bd5d23e843a4bf69c06a02681450e858ae
Author: Vincent Fazio <[email protected]> Date: Wed Jan 15 19:29:07 2020 +0100
toolchain: allow using custom headers newer than latest known ones
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/3 {linux, linux-headers}: add version 5.6
In reply to Bernd Kuhls--- 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(-)
linux/Config.in +2 -2
@@ -27,7 +27,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (5.5)" + bool "Latest version (5.6)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (4.19.98-cip19)"
@@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.5.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "5.6" if BR2_LINUX_KERNEL_LATEST_VERSION default "4.19.98-cip19" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "4.19.98-cip19-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
linux/linux.hash +1 -0
@@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256 e342b04a2aa63808ea0ef1baab28fc520bd031ef8cf93d9ee4a31d4058fcb622 linux-5.6.tar.xz sha256 1f3b3614a06bffc9c621c82f98d8ca88c60538a8c6dd77f96f2e7fee310a4ee2 linux-5.5.13.tar.xz sha256 19b9cd362d647f2529c5ffc02ede52ac6b517eb685481b9cd00f7de3d30dec6b linux-5.4.27.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
package/linux-headers/Config.in.host +10 -1
@@ -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_5 + default BR2_KERNEL_HEADERS_5_6 help Select the kernel version to get headers from.
@@ -59,6 +59,10 @@ config BR2_KERNEL_HEADERS_5_5 bool "Linux 5.5.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 +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_VERSION bool "Manually specified Linux version" help
@@ -131,6 +135,10 @@ 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_6 + bool "5.6.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_5 bool "5.5.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5
@@ -332,6 +340,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.112" if BR2_KERNEL_HEADERS_4_19 default "5.4.27" if BR2_KERNEL_HEADERS_5_4 default "5.5.13" if BR2_KERNEL_HEADERS_5_5 + default "5.6" if BR2_KERNEL_HEADERS_5_6 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 \
toolchain/Config.in +5 -0
@@ -472,6 +472,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that
@@ -485,6 +489,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + 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 default "5.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3
toolchain/toolchain-external/toolchain-external-custom/Config.in.options +4 -0
@@ -115,6 +115,10 @@ 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_6 + bool "5.6.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_5 bool "5.5.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5
Signature · 1 line
2.25.0
PATCH 3/3 {linux, linux-headers}: add version 5.6
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Signed-off-by Bernd Kuhls <[email protected]>
Committed (after moving the ..or later text to 5.6), thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/3 toolchain/Config.in: move BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5
In reply to Bernd KuhlsQuoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Config option was placed at the wrong position.
Signed-off-by Bernd Kuhls <[email protected]>
Committed, thanks.
Quoted 37 lines
--- toolchain/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)toolchain/Config.in +4
-4@@ -468,6 +468,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that@@ -477,10 +481,6 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 config BR2_TOOLCHAIN_HEADERS_LATEST bool -config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 - bool - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 - # 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_LEASTSignature · 6 lines
2.25.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 1 line
Bye, Peter Korsgaard