* [Buildroot] [PATCH 2/4] {toolchain, linux-headers}: add support for 6.11 headers
2024-10-13 10:33 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Bernd Kuhls
@ 2024-10-13 10:33 ` Bernd Kuhls
2024-10-13 10:33 ` [Buildroot] [PATCH 3/4] linux: bump latest version to 6.11 Bernd Kuhls
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2024-10-13 10:33 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Giulio Benetti, Thomas Petazzoni
And add (and default to) 6.11 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 ea13ab0aeb..32e1be4091 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 057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73 linux-6.11.3.tar.xz
sha256 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e linux-6.10.14.tar.xz
sha256 f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 linux-6.6.56.tar.xz
sha256 8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24 linux-6.1.112.tar.xz
--git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 39dca346ea..a3610d7ecd 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_10
+ default BR2_KERNEL_HEADERS_6_11
help
Select the kernel version to get headers from.
@@ -51,6 +51,10 @@ config BR2_KERNEL_HEADERS_6_6
config BR2_KERNEL_HEADERS_6_10
bool "Linux 6.10.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
+
+config BR2_KERNEL_HEADERS_6_11
+ bool "Linux 6.11.x kernel headers"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
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_11
+ bool "6.11.x or later"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
+
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10
- bool "6.10.x or later"
+ bool "6.10.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_9
@@ -431,6 +439,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "6.1.112" if BR2_KERNEL_HEADERS_6_1
default "6.6.56" if BR2_KERNEL_HEADERS_6_6
default "6.10.14" if BR2_KERNEL_HEADERS_6_10
+ default "6.11.3" if BR2_KERNEL_HEADERS_6_11
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 6e91ab756c..c2522aca7f 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -656,6 +656,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
+ bool
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
select BR2_TOOLCHAIN_HEADERS_LATEST
# This should be selected by the latest version, above, to indicate that
@@ -669,6 +673,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
# stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string
+ default "6.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
default "6.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
default "6.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
default "6.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index 0daa1e3583..fcffeb6b77 100644
--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
@@ -166,8 +166,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_11
+ bool "6.11.x or later"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
+
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_10
- bool "6.10.x or later"
+ bool "6.10.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_9
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 3/4] linux: bump latest version to 6.11
2024-10-13 10:33 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Bernd Kuhls
2024-10-13 10:33 ` [Buildroot] [PATCH 2/4] {toolchain, linux-headers}: add support for 6.11 headers Bernd Kuhls
@ 2024-10-13 10:33 ` Bernd Kuhls
2024-10-13 10:33 ` [Buildroot] [PATCH 4/4] package/linux-headers: drop 6.10.x option Bernd Kuhls
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2024-10-13 10:33 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Giulio Benetti, Thomas Petazzoni
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 9ecddd0dd9..497b507945 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.10)"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 if BR2_KERNEL_HEADERS_AS_KERNEL
+ bool "Latest version (6.11)"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 if BR2_KERNEL_HEADERS_AS_KERNEL
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
bool "Latest CIP SLTS version (5.10.162-cip24)"
@@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES
config BR2_LINUX_KERNEL_VERSION
string
- default "6.10.14" if BR2_LINUX_KERNEL_LATEST_VERSION
+ default "6.11.3" 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.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 4/4] package/linux-headers: drop 6.10.x option
2024-10-13 10:33 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Bernd Kuhls
2024-10-13 10:33 ` [Buildroot] [PATCH 2/4] {toolchain, linux-headers}: add support for 6.11 headers Bernd Kuhls
2024-10-13 10:33 ` [Buildroot] [PATCH 3/4] linux: bump latest version to 6.11 Bernd Kuhls
@ 2024-10-13 10:33 ` Bernd Kuhls
2024-10-22 21:08 ` [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Thomas Petazzoni via buildroot
2024-11-06 20:56 ` Peter Korsgaard
4 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2024-10-13 10:33 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Giulio Benetti, Thomas Petazzoni
The 6.10.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 6a1518f439..4a47a2dda1 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2024.11"
+config BR2_KERNEL_HEADERS_6_10
+ bool "kernel headers version 6.10.x are no longer supported"
+ select BR2_LEGACY
+ help
+ Version 6.10.x of the Linux kernel headers are no longer
+ maintained upstream and are now removed.
+
config BR2_PACKAGE_IPMITOOL_PEN_REG_URI
string "IANA PEN registry moved to iana-assignment package"
help
diff --git a/linux/linux.hash b/linux/linux.hash
index 32e1be4091..5233de2b0b 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 057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73 linux-6.11.3.tar.xz
-sha256 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e linux-6.10.14.tar.xz
sha256 f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 linux-6.6.56.tar.xz
sha256 8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24 linux-6.1.112.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 a3610d7ecd..7c1611699c 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -48,10 +48,6 @@ config BR2_KERNEL_HEADERS_6_6
bool "Linux 6.6.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
-config BR2_KERNEL_HEADERS_6_10
- bool "Linux 6.10.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10
-
config BR2_KERNEL_HEADERS_6_11
bool "Linux 6.11.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11
@@ -438,7 +434,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.15.167" if BR2_KERNEL_HEADERS_5_15
default "6.1.112" if BR2_KERNEL_HEADERS_6_1
default "6.6.56" if BR2_KERNEL_HEADERS_6_6
- default "6.10.14" if BR2_KERNEL_HEADERS_6_10
default "6.11.3" if BR2_KERNEL_HEADERS_6_11
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6, 10}.x series
2024-10-13 10:33 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Bernd Kuhls
` (2 preceding siblings ...)
2024-10-13 10:33 ` [Buildroot] [PATCH 4/4] package/linux-headers: drop 6.10.x option Bernd Kuhls
@ 2024-10-22 21:08 ` Thomas Petazzoni via buildroot
2024-11-06 20:56 ` Peter Korsgaard
4 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-10-22 21:08 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot, Romain Naour, Giulio Benetti
On Sun, 13 Oct 2024 12:33:38 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> linux/Config.in | 2 +-
> linux/linux.hash | 6 +++---
> package/linux-headers/Config.in.host | 6 +++---
> 3 files changed, 7 insertions(+), 7 deletions(-)
Series applied, thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6, 10}.x series
2024-10-13 10:33 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Bernd Kuhls
` (3 preceding siblings ...)
2024-10-22 21:08 ` [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Thomas Petazzoni via buildroot
@ 2024-11-06 20:56 ` Peter Korsgaard
4 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2024-11-06 20:56 UTC (permalink / raw)
To: buildroot
On 10/13/24 12:33, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> linux/Config.in | 2 +-
> linux/linux.hash | 6 +++---
> package/linux-headers/Config.in.host | 6 +++---
> 3 files changed, 7 insertions(+), 7 deletions(-)
Committed to 2024.02.x and 2024.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread