* [Buildroot] [PATCH 2/4] {toolchain, linux-headers}: add support for 6.5 headers
2023-09-23 17:32 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 4}.x series Bernd Kuhls
@ 2023-09-23 17:32 ` Bernd Kuhls
2023-09-27 19:06 ` Peter Korsgaard
2023-09-23 17:32 ` [Buildroot] [PATCH 3/4] linux: bump latest version to 6.5 Bernd Kuhls
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Bernd Kuhls @ 2023-09-23 17:32 UTC (permalink / raw)
To: buildroot
Cc: Thomas Petazzoni, Romain Naour, Giulio Benetti,
Thomas De Schampheleire
And add (and default to) 6.5 to linux-headers.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
linux/linux.hash | 1 +
| 13 +++++++++++--
toolchain/Config.in | 5 +++++
.../toolchain-external-custom/Config.in.options | 6 +++++-
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/linux/linux.hash b/linux/linux.hash
index cac7fba207..858e615a12 100644
--- a/linux/linux.hash
+++ b/linux/linux.hash
@@ -1,4 +1,5 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
+sha256 8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95 linux-6.5.5.tar.xz
sha256 9626ec84a39ecb009bf11a271dd520941159c165d4e62f82e3a77b79d20ff27d linux-6.4.16.tar.xz
sha256 a87e241ec15d53452c4efe219713a3769d88cc436b5b98cf6efb262c4aff15c0 linux-6.1.55.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
--git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index a0bdbe8555..ee4e953bf0 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -3,7 +3,7 @@ comment "Kernel Header Options"
choice
prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
- default BR2_KERNEL_HEADERS_6_4
+ default BR2_KERNEL_HEADERS_6_5
help
Select the kernel version to get headers from.
@@ -52,6 +52,10 @@ config BR2_KERNEL_HEADERS_6_1
config BR2_KERNEL_HEADERS_6_4
bool "Linux 6.4.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
+
+config BR2_KERNEL_HEADERS_6_5
+ bool "Linux 6.5.x kernel headers"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
select BR2_KERNEL_HEADERS_LATEST
config BR2_KERNEL_HEADERS_VERSION
@@ -129,8 +133,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_6_5
+ bool "6.5.x or later"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
+
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4
- bool "6.4.x or later"
+ bool "6.4.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_3
@@ -407,6 +415,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.15.133" if BR2_KERNEL_HEADERS_5_15
default "6.1.55" if BR2_KERNEL_HEADERS_6_1
default "6.4.16" if BR2_KERNEL_HEADERS_6_4
+ default "6.5.5" if BR2_KERNEL_HEADERS_6_5
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 da6bf5f4c8..d8081f1b9d 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -636,6 +636,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
+ bool
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
select BR2_TOOLCHAIN_HEADERS_LATEST
# This should be selected by the latest version, above, to indicate that
@@ -649,6 +653,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
# stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string
+ default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
default "6.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
default "6.3" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
default "6.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2
diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index 0f4f5eef2e..556ca7a642 100644
--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
@@ -162,8 +162,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_6_5
+ bool "6.5.x or later"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
+
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_4
- bool "6.4.x or later"
+ bool "6.4.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_3
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 3/4] linux: bump latest version to 6.5
2023-09-23 17:32 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 4}.x series Bernd Kuhls
2023-09-23 17:32 ` [Buildroot] [PATCH 2/4] {toolchain, linux-headers}: add support for 6.5 headers Bernd Kuhls
@ 2023-09-23 17:32 ` Bernd Kuhls
2023-09-27 19:06 ` Peter Korsgaard
2023-09-23 17:32 ` [Buildroot] [PATCH 4/4] package/linux-headers: drop 6.4.x option Bernd Kuhls
2023-09-27 19:06 ` [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 4}.x series Peter Korsgaard
3 siblings, 1 reply; 8+ messages in thread
From: Bernd Kuhls @ 2023-09-23 17:32 UTC (permalink / raw)
To: buildroot
Cc: Thomas Petazzoni, Romain Naour, Giulio Benetti,
Thomas De Schampheleire
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
linux/Config.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index 7ddcf013f8..8dcc493e2e 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -28,8 +28,8 @@ choice
prompt "Kernel version"
config BR2_LINUX_KERNEL_LATEST_VERSION
- bool "Latest version (6.4)"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 if BR2_KERNEL_HEADERS_AS_KERNEL
+ bool "Latest version (6.5)"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 if BR2_KERNEL_HEADERS_AS_KERNEL
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
bool "Latest CIP SLTS version (5.10.162-cip24)"
@@ -128,7 +128,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
- default "6.4.16" if BR2_LINUX_KERNEL_LATEST_VERSION
+ default "6.5.5" if BR2_LINUX_KERNEL_LATEST_VERSION
default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 4/4] package/linux-headers: drop 6.4.x option
2023-09-23 17:32 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 4}.x series Bernd Kuhls
2023-09-23 17:32 ` [Buildroot] [PATCH 2/4] {toolchain, linux-headers}: add support for 6.5 headers Bernd Kuhls
2023-09-23 17:32 ` [Buildroot] [PATCH 3/4] linux: bump latest version to 6.5 Bernd Kuhls
@ 2023-09-23 17:32 ` Bernd Kuhls
2023-09-27 19:07 ` Peter Korsgaard
2023-09-27 19:06 ` [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 4}.x series Peter Korsgaard
3 siblings, 1 reply; 8+ messages in thread
From: Bernd Kuhls @ 2023-09-23 17:32 UTC (permalink / raw)
To: buildroot
Cc: Thomas Petazzoni, Romain Naour, Giulio Benetti,
Thomas De Schampheleire
The 6.4.x series is now EOL upstream, so drop the linux-headers option
and add legacy handling for it.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
Config.in.legacy | 7 +++++++
linux/linux.hash | 1 -
| 5 -----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index daf83dda4a..ca80279212 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2023.11"
+config BR2_KERNEL_HEADERS_6_4
+ bool "kernel headers version 6.4.x are no longer supported"
+ select BR2_LEGACY
+ help
+ Version 6.4.x of the Linux kernel headers are no longer
+ maintained upstream and are now removed.
+
config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS
bool "google-material-design-icons removed"
select BR2_LEGACY
diff --git a/linux/linux.hash b/linux/linux.hash
index 858e615a12..bdd27eb600 100644
--- a/linux/linux.hash
+++ b/linux/linux.hash
@@ -1,6 +1,5 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95 linux-6.5.5.tar.xz
-sha256 9626ec84a39ecb009bf11a271dd520941159c165d4e62f82e3a77b79d20ff27d linux-6.4.16.tar.xz
sha256 a87e241ec15d53452c4efe219713a3769d88cc436b5b98cf6efb262c4aff15c0 linux-6.1.55.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 ef845e7934897b88e4448378ea9daacac19e07f156fe904844fab0a7d8ff5ddd linux-5.15.133.tar.xz
--git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index ee4e953bf0..d1023a15e6 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -49,10 +49,6 @@ config BR2_KERNEL_HEADERS_6_1
bool "Linux 6.1.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1
-config BR2_KERNEL_HEADERS_6_4
- bool "Linux 6.4.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
-
config BR2_KERNEL_HEADERS_6_5
bool "Linux 6.5.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
@@ -414,7 +410,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.10.197" if BR2_KERNEL_HEADERS_5_10
default "5.15.133" if BR2_KERNEL_HEADERS_5_15
default "6.1.55" if BR2_KERNEL_HEADERS_6_1
- default "6.4.16" if BR2_KERNEL_HEADERS_6_4
default "6.5.5" if BR2_KERNEL_HEADERS_6_5
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 4}.x series
2023-09-23 17:32 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 4}.x series Bernd Kuhls
` (2 preceding siblings ...)
2023-09-23 17:32 ` [Buildroot] [PATCH 4/4] package/linux-headers: drop 6.4.x option Bernd Kuhls
@ 2023-09-27 19:06 ` Peter Korsgaard
3 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2023-09-27 19:06 UTC (permalink / raw)
To: Bernd Kuhls
Cc: Thomas De Schampheleire, Romain Naour, Giulio Benetti,
Thomas Petazzoni, buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 8+ messages in thread