* [Buildroot] [PATCH 2/3] {toolchain, linux-headers}: add support for 6.5 headers
2023-09-22 19:33 [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 4}.x series Bernd Kuhls
@ 2023-09-22 19:33 ` Bernd Kuhls
2023-09-22 19:33 ` [Buildroot] [PATCH 3/3] package/linux-headers: drop 6.4.x option Bernd Kuhls
2023-09-30 10:29 ` [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 4}.x series Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Bernd Kuhls @ 2023-09-22 19:33 UTC (permalink / raw)
To: buildroot
Cc: Thomas De Schampheleire, Giulio Benetti, Romain Naour,
Thomas Petazzoni
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 ecd3492c43..d770b77627 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 bdf76c15229b241e578046b8486106f09534d754ea4cbf105e0660e551fb1669 linux-6.5.4.tar.xz
sha256 9626ec84a39ecb009bf11a271dd520941159c165d4e62f82e3a77b79d20ff27d linux-6.4.16.tar.xz
sha256 a3181e46d407cd6ab15f412402e8220684ff9659b0262b7a3de7384405ce4e27 linux-6.1.54.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 3eb47e315b..77b5d19e2b 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.132" if BR2_KERNEL_HEADERS_5_15
default "6.1.54" if BR2_KERNEL_HEADERS_6_1
default "6.4.16" if BR2_KERNEL_HEADERS_6_4
+ default "6.5.4" 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] 4+ messages in thread* [Buildroot] [PATCH 3/3] package/linux-headers: drop 6.4.x option
2023-09-22 19:33 [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 4}.x series Bernd Kuhls
2023-09-22 19:33 ` [Buildroot] [PATCH 2/3] {toolchain, linux-headers}: add support for 6.5 headers Bernd Kuhls
@ 2023-09-22 19:33 ` Bernd Kuhls
2023-09-30 10:29 ` [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 4}.x series Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Bernd Kuhls @ 2023-09-22 19:33 UTC (permalink / raw)
To: buildroot
Cc: Thomas De Schampheleire, Giulio Benetti, Romain Naour,
Thomas Petazzoni
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 d770b77627..f0ab738c3d 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 bdf76c15229b241e578046b8486106f09534d754ea4cbf105e0660e551fb1669 linux-6.5.4.tar.xz
-sha256 9626ec84a39ecb009bf11a271dd520941159c165d4e62f82e3a77b79d20ff27d linux-6.4.16.tar.xz
sha256 a3181e46d407cd6ab15f412402e8220684ff9659b0262b7a3de7384405ce4e27 linux-6.1.54.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 4177b5c4d6e749bb8339ac4aa68eb0932ead9490b956a80d9a597089959618ac linux-5.15.132.tar.xz
--git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 77b5d19e2b..986ebb94d5 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.196" if BR2_KERNEL_HEADERS_5_10
default "5.15.132" if BR2_KERNEL_HEADERS_5_15
default "6.1.54" if BR2_KERNEL_HEADERS_6_1
- default "6.4.16" if BR2_KERNEL_HEADERS_6_4
default "6.5.4" 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] 4+ messages in thread* Re: [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 4}.x series
2023-09-22 19:33 [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 4}.x series Bernd Kuhls
2023-09-22 19:33 ` [Buildroot] [PATCH 2/3] {toolchain, linux-headers}: add support for 6.5 headers Bernd Kuhls
2023-09-22 19:33 ` [Buildroot] [PATCH 3/3] package/linux-headers: drop 6.4.x option Bernd Kuhls
@ 2023-09-30 10:29 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2023-09-30 10:29 UTC (permalink / raw)
To: Bernd Kuhls
Cc: Thomas Petazzoni, Giulio Benetti, Romain Naour,
Thomas De Schampheleire, buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Committed to 2023.02.x and 2023.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread