* [Buildroot] [PATCH 2/4] {toolchain, linux-headers}: add support for 6.9 headers
2024-06-15 11:30 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6}.x series Bernd Kuhls
@ 2024-06-15 11:30 ` Bernd Kuhls
2024-06-15 11:30 ` [Buildroot] [PATCH 3/4] linux: bump latest version to 6.9 Bernd Kuhls
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Bernd Kuhls @ 2024-06-15 11:30 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Giulio Benetti, Thomas Petazzoni
And add (and default to) 6.9 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 9374af71b0..ac7028c535 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 272800e0d1a7d01a78bce95a3aaf5c80816f50eb15c517d7003e58355760ecc2 linux-6.9.4.tar.xz
sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz
sha256 a13ebc20dc2a75722699949af74aa86a4ce5d544d6daaa6a7de4e8c81b40de97 linux-6.6.33.tar.xz
sha256 df31af2ef5923d61fadd68bfd991f50f2e42a913895eb4b03214ee78f8720bcf linux-6.1.93.tar.xz
--git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 487d941a16..e2664a523e 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_8
+ default BR2_KERNEL_HEADERS_6_9
help
Select the kernel version to get headers from.
@@ -51,6 +51,10 @@ config BR2_KERNEL_HEADERS_6_6
config BR2_KERNEL_HEADERS_6_8
bool "Linux 6.8.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
+
+config BR2_KERNEL_HEADERS_6_9
+ bool "Linux 6.9.x kernel headers"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
select BR2_KERNEL_HEADERS_LATEST
config BR2_KERNEL_HEADERS_VERSION
@@ -128,8 +132,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_9
+ bool "6.9.x or later"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
+
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8
- bool "6.8.x or later"
+ bool "6.8.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7
@@ -422,6 +430,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "6.1.93" if BR2_KERNEL_HEADERS_6_1
default "6.6.33" if BR2_KERNEL_HEADERS_6_6
default "6.8.12" if BR2_KERNEL_HEADERS_6_8
+ default "6.9.4" if BR2_KERNEL_HEADERS_6_9
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 baf69ce463..1aa17cbfbd 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -647,6 +647,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
+ bool
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
select BR2_TOOLCHAIN_HEADERS_LATEST
# This should be selected by the latest version, above, to indicate that
@@ -660,6 +664,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
# stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string
+ default "6.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
default "6.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index 1c4b0d2554..45a87fb3c8 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_9
+ bool "6.9.x or later"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
+
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_8
- bool "6.8.x or later"
+ bool "6.8.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_7
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 3/4] linux: bump latest version to 6.9
2024-06-15 11:30 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6}.x series Bernd Kuhls
2024-06-15 11:30 ` [Buildroot] [PATCH 2/4] {toolchain, linux-headers}: add support for 6.9 headers Bernd Kuhls
@ 2024-06-15 11:30 ` Bernd Kuhls
2024-06-16 13:21 ` Jarkko Sakkinen
2024-06-15 11:30 ` [Buildroot] [PATCH 4/4] package/linux-headers: drop 6.8.x option Bernd Kuhls
` (2 subsequent siblings)
4 siblings, 1 reply; 7+ messages in thread
From: Bernd Kuhls @ 2024-06-15 11:30 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 194a24f391..865b7fd240 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.8)"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 if BR2_KERNEL_HEADERS_AS_KERNEL
+ bool "Latest version (6.9)"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 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.8.12" if BR2_LINUX_KERNEL_LATEST_VERSION
+ default "6.9.4" 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] 7+ messages in thread* Re: [Buildroot] [PATCH 3/4] linux: bump latest version to 6.9
2024-06-15 11:30 ` [Buildroot] [PATCH 3/4] linux: bump latest version to 6.9 Bernd Kuhls
@ 2024-06-16 13:21 ` Jarkko Sakkinen
0 siblings, 0 replies; 7+ messages in thread
From: Jarkko Sakkinen @ 2024-06-16 13:21 UTC (permalink / raw)
To: Bernd Kuhls, buildroot; +Cc: Romain Naour, Giulio Benetti, Thomas Petazzoni
On Sat Jun 15, 2024 at 2:30 PM EEST, Bernd Kuhls wrote:
> 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 194a24f391..865b7fd240 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.8)"
> - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 if BR2_KERNEL_HEADERS_AS_KERNEL
> + bool "Latest version (6.9)"
> + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 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.8.12" if BR2_LINUX_KERNEL_LATEST_VERSION
> + default "6.9.4" 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 \
I don't that will result successful compilation when using systemd,
so I guess this has been only tested with busybox, right?
I had to do this fix in order to make systemd work with v6.9:
https://lists.buildroot.org/pipermail/buildroot/2024-June/755222.html
So I see two issues in total in this patch:
1. It maintains the same build issue as with 6.8.12.
2. Bugs should be a priority over features, right?
Maybe this should combined to a patch set with my patch as first
so that the version update could be landed cleanly?
BR, Jarkko
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 4/4] package/linux-headers: drop 6.8.x option
2024-06-15 11:30 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6}.x series Bernd Kuhls
2024-06-15 11:30 ` [Buildroot] [PATCH 2/4] {toolchain, linux-headers}: add support for 6.9 headers Bernd Kuhls
2024-06-15 11:30 ` [Buildroot] [PATCH 3/4] linux: bump latest version to 6.9 Bernd Kuhls
@ 2024-06-15 11:30 ` Bernd Kuhls
2024-06-15 16:47 ` [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6}.x series Yann E. MORIN
2024-06-24 5:11 ` Peter Korsgaard
4 siblings, 0 replies; 7+ messages in thread
From: Bernd Kuhls @ 2024-06-15 11:30 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Giulio Benetti, Thomas Petazzoni
The 6.8.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 | 9 ++++++++-
linux/linux.hash | 1 -
| 5 -----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index f0bff5191f..c1d6fd646e 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -144,7 +144,14 @@ endif
###############################################################################
-comment "Legacy options removed in 2024.05"
+comment "Legacy options removed in 2024.08"
+
+config BR2_KERNEL_HEADERS_6_8
+ bool "kernel headers version 6.8.x are no longer supported"
+ select BR2_LEGACY
+ help
+ Version 6.8.x of the Linux kernel headers are no longer
+ maintained upstream and are now removed.
config BR2_TARGET_AT91BOOTSTRAP
bool "at91bootstrap removed"
diff --git a/linux/linux.hash b/linux/linux.hash
index ac7028c535..6ebd708bcb 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 272800e0d1a7d01a78bce95a3aaf5c80816f50eb15c517d7003e58355760ecc2 linux-6.9.4.tar.xz
-sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz
sha256 a13ebc20dc2a75722699949af74aa86a4ce5d544d6daaa6a7de4e8c81b40de97 linux-6.6.33.tar.xz
sha256 df31af2ef5923d61fadd68bfd991f50f2e42a913895eb4b03214ee78f8720bcf linux-6.1.93.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 e2664a523e..7b7928549c 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_8
- bool "Linux 6.8.x kernel headers"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8
-
config BR2_KERNEL_HEADERS_6_9
bool "Linux 6.9.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9
@@ -429,7 +425,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.15.160" if BR2_KERNEL_HEADERS_5_15
default "6.1.93" if BR2_KERNEL_HEADERS_6_1
default "6.6.33" if BR2_KERNEL_HEADERS_6_6
- default "6.8.12" if BR2_KERNEL_HEADERS_6_8
default "6.9.4" if BR2_KERNEL_HEADERS_6_9
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] 7+ messages in thread* Re: [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6}.x series
2024-06-15 11:30 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6}.x series Bernd Kuhls
` (2 preceding siblings ...)
2024-06-15 11:30 ` [Buildroot] [PATCH 4/4] package/linux-headers: drop 6.8.x option Bernd Kuhls
@ 2024-06-15 16:47 ` Yann E. MORIN
2024-06-24 5:11 ` Peter Korsgaard
4 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2024-06-15 16:47 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Romain Naour, Giulio Benetti, Thomas Petazzoni, buildroot
Bernd, All,
On 2024-06-15 13:30 +0200, Bernd Kuhls spake thusly:
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Whole series of 4 patches applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> linux/linux.hash | 4 ++--
> package/linux-headers/Config.in.host | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/linux/linux.hash b/linux/linux.hash
> index b972557fc0..9374af71b0 100644
> --- a/linux/linux.hash
> +++ b/linux/linux.hash
> @@ -1,7 +1,7 @@
> # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
> sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz
> -sha256 aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1 linux-6.6.32.tar.xz
> -sha256 9019f427bfdc9ced5bc954d760d37ac08c0cdffb45ad28087fc45a73e64336c9 linux-6.1.92.tar.xz
> +sha256 a13ebc20dc2a75722699949af74aa86a4ce5d544d6daaa6a7de4e8c81b40de97 linux-6.6.33.tar.xz
> +sha256 df31af2ef5923d61fadd68bfd991f50f2e42a913895eb4b03214ee78f8720bcf linux-6.1.93.tar.xz
> # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
> sha256 f41e718e33b88f269a6b6a7653e5e9824c4ba541f6ffe5bf26ecc37c540a1b05 linux-5.15.160.tar.xz
> sha256 9c36b243e8c3ec1d5963366618f336710b84340bf95be2037b26c452392cb2d6 linux-5.10.218.tar.xz
> diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
> index 48101783b9..487d941a16 100644
> --- a/package/linux-headers/Config.in.host
> +++ b/package/linux-headers/Config.in.host
> @@ -419,8 +419,8 @@ config BR2_DEFAULT_KERNEL_HEADERS
> default "5.4.277" if BR2_KERNEL_HEADERS_5_4
> default "5.10.218" if BR2_KERNEL_HEADERS_5_10
> default "5.15.160" if BR2_KERNEL_HEADERS_5_15
> - default "6.1.92" if BR2_KERNEL_HEADERS_6_1
> - default "6.6.32" if BR2_KERNEL_HEADERS_6_6
> + default "6.1.93" if BR2_KERNEL_HEADERS_6_1
> + default "6.6.33" if BR2_KERNEL_HEADERS_6_6
> default "6.8.12" if BR2_KERNEL_HEADERS_6_8
> 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
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6}.x series
2024-06-15 11:30 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6}.x series Bernd Kuhls
` (3 preceding siblings ...)
2024-06-15 16:47 ` [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 6.{1, 6}.x series Yann E. MORIN
@ 2024-06-24 5:11 ` Peter Korsgaard
4 siblings, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2024-06-24 5:11 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Romain Naour, Giulio Benetti, Thomas Petazzoni, buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Committed to 2024.02.x and 2024.05.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread