* [Buildroot] [PATCH 2/4] {toolchain, linux-headers}: add support for 6.7 headers
2024-01-13 16:26 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Bernd Kuhls
@ 2024-01-13 16:26 ` Bernd Kuhls
2024-01-13 16:26 ` [Buildroot] [PATCH 3/4] linux: bump latest version to 6.7 Bernd Kuhls
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Bernd Kuhls @ 2024-01-13 16:26 UTC (permalink / raw)
To: buildroot
Cc: Thomas De Schampheleire, Romain Naour, Giulio Benetti,
Thomas Petazzoni
And add (and default to) 6.7 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 2b904c298a..daf1368f7e 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 ef31144a2576d080d8c31698e83ec9f66bf97c677fa2aaf0d5bbb9f3345b1069 linux-6.7.tar.xz
sha256 afe2e5a661bb886d762684ebea71607d1ee8cb9dd100279d2810ba20d9671e52 linux-6.6.11.tar.xz
sha256 98dce69077c35cffca799dcdbbd32a02242aad6b0950eb931936bb2ef69f0926 linux-6.1.72.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 f4c1cba23e..5b9366aed5 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_6
+ default BR2_KERNEL_HEADERS_6_7
help
Select the kernel version to get headers from.
@@ -52,6 +52,10 @@ config BR2_KERNEL_HEADERS_6_1
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_7
+ bool "Linux 6.7.x kernel headers"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
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_7
+ bool "6.7.x or later"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
+
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6
- bool "6.6.x or later"
+ bool "6.6.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5
@@ -415,6 +423,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.15.146" if BR2_KERNEL_HEADERS_5_15
default "6.1.72" if BR2_KERNEL_HEADERS_6_1
default "6.6.11" if BR2_KERNEL_HEADERS_6_6
+ default "6.7" if BR2_KERNEL_HEADERS_6_7
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 34e0ae2c5f..12150eff0c 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -644,6 +644,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
+ bool
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
select BR2_TOOLCHAIN_HEADERS_LATEST
# This should be selected by the latest version, above, to indicate that
@@ -657,6 +661,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
# stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string
+ default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5
default "6.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4
diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index 5554d56719..a7c239dcab 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_7
+ bool "6.7.x or later"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7
+
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6
- bool "6.6.x or later"
+ bool "6.6.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_5
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH 3/4] linux: bump latest version to 6.7
2024-01-13 16:26 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Bernd Kuhls
2024-01-13 16:26 ` [Buildroot] [PATCH 2/4] {toolchain, linux-headers}: add support for 6.7 headers Bernd Kuhls
@ 2024-01-13 16:26 ` Bernd Kuhls
2024-01-13 20:42 ` Peter Korsgaard
2024-01-13 16:26 ` [Buildroot] [PATCH 4/4] package/linux-headers: drop 4.14.x option Bernd Kuhls
` (4 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Bernd Kuhls @ 2024-01-13 16:26 UTC (permalink / raw)
To: buildroot
Cc: Thomas De Schampheleire, 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 9f9cf55d96..78e90b495a 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.6)"
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 if BR2_KERNEL_HEADERS_AS_KERNEL
+ bool "Latest version (6.7)"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 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.6.11" if BR2_LINUX_KERNEL_LATEST_VERSION
+ default "6.7" 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] 10+ messages in thread* Re: [Buildroot] [PATCH 3/4] linux: bump latest version to 6.7
2024-01-13 16:26 ` [Buildroot] [PATCH 3/4] linux: bump latest version to 6.7 Bernd Kuhls
@ 2024-01-13 20:42 ` Peter Korsgaard
0 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2024-01-13 20:42 UTC (permalink / raw)
To: Bernd Kuhls
Cc: Thomas Petazzoni, Romain Naour, Giulio Benetti,
Thomas De Schampheleire, buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:
> 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 9f9cf55d96..78e90b495a 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.6)"
> - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 if BR2_KERNEL_HEADERS_AS_KERNEL
> + bool "Latest version (6.7)"
> + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 if BR2_KERNEL_HEADERS_AS_KERNEL
Given how close we are to 2024.02-rc1 and the fact that kernel 6.6 is a
LTS kernel I would prefer to wait with this patch until 2024.02-rc1 is
tagged and then add it to next instead (same for the one for 6.7
headers).
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 4/4] package/linux-headers: drop 4.14.x option
2024-01-13 16:26 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Bernd Kuhls
2024-01-13 16:26 ` [Buildroot] [PATCH 2/4] {toolchain, linux-headers}: add support for 6.7 headers Bernd Kuhls
2024-01-13 16:26 ` [Buildroot] [PATCH 3/4] linux: bump latest version to 6.7 Bernd Kuhls
@ 2024-01-13 16:26 ` Bernd Kuhls
2024-01-13 20:42 ` Peter Korsgaard
2024-01-13 20:41 ` [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Peter Korsgaard
` (3 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Bernd Kuhls @ 2024-01-13 16:26 UTC (permalink / raw)
To: buildroot
Cc: Thomas De Schampheleire, Romain Naour, Giulio Benetti,
Thomas Petazzoni
The 4.14.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 -
| 6 ------
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 46ae84997e..82387338d9 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2024.02"
+config BR2_KERNEL_HEADERS_4_14
+ bool "kernel headers version 4.14.x are no longer supported"
+ select BR2_LEGACY
+ help
+ Version 4.14.x of the Linux kernel headers are no longer
+ maintained upstream and are now removed.
+
config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI
bool "libcamera pipeline 'raspberrypi' was renamed to 'rpi/vc4'"
depends on BR2_arm || BR2_aarch64
diff --git a/linux/linux.hash b/linux/linux.hash
index daf1368f7e..e15c298953 100644
--- a/linux/linux.hash
+++ b/linux/linux.hash
@@ -8,7 +8,6 @@ sha256 86ace9892296bf1534d574894edd27614b68de4085c03fd3f60121751a334f1b linux-
sha256 da072f7e6fe719c01e517cac1fa9988b2f5fa87d62a8501b7dc16d3b62b2acb6 linux-5.4.266.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256 cdc6a5d51aaff7c50bfe4ac4adf5cc3727043a24641145dc268e858db2a4b598 linux-4.19.304.tar.xz
-sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz
# Locally computed
sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz
sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz
--git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 5b9366aed5..81631caeec 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -24,11 +24,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL
depends on BR2_LINUX_KERNEL
select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION
-config BR2_KERNEL_HEADERS_4_14
- bool "Linux 4.14.x kernel headers"
- depends on !BR2_riscv
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
-
config BR2_KERNEL_HEADERS_4_19
bool "Linux 4.19.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
@@ -416,7 +411,6 @@ endchoice
config BR2_DEFAULT_KERNEL_HEADERS
string
- default "4.14.336" if BR2_KERNEL_HEADERS_4_14
default "4.19.304" if BR2_KERNEL_HEADERS_4_19
default "5.4.266" if BR2_KERNEL_HEADERS_5_4
default "5.10.207" if BR2_KERNEL_HEADERS_5_10
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series
2024-01-13 16:26 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Bernd Kuhls
` (2 preceding siblings ...)
2024-01-13 16:26 ` [Buildroot] [PATCH 4/4] package/linux-headers: drop 4.14.x option Bernd Kuhls
@ 2024-01-13 20:41 ` Peter Korsgaard
2024-01-14 16:36 ` Peter Korsgaard
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2024-01-13 20:41 UTC (permalink / raw)
To: Bernd Kuhls
Cc: Thomas Petazzoni, Romain Naour, Giulio Benetti,
Thomas De Schampheleire, 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] 10+ messages in thread* Re: [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series
2024-01-13 16:26 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Bernd Kuhls
` (3 preceding siblings ...)
2024-01-13 20:41 ` [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Peter Korsgaard
@ 2024-01-14 16:36 ` Peter Korsgaard
2024-01-14 16:37 ` Peter Korsgaard
[not found] ` <875xzvna6v.fsf__46587.6769552537$1705250246$gmane$org@48ers.dk>
6 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2024-01-14 16:36 UTC (permalink / raw)
To: Bernd Kuhls
Cc: Thomas Petazzoni, Romain Naour, Giulio Benetti,
Thomas De Schampheleire, buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> linux/Config.in | 2 +-
> linux/linux.hash | 12 ++++++------
> package/linux-headers/Config.in.host | 12 ++++++------
> 3 files changed, 13 insertions(+), 13 deletions(-)
> config BR2_DEFAULT_KERNEL_HEADERS
> string
> - default "4.14.334" if BR2_KERNEL_HEADERS_4_14
> - default "4.19.303" if BR2_KERNEL_HEADERS_4_19
> - default "5.4.265" if BR2_KERNEL_HEADERS_5_4
> - default "5.10.206" if BR2_KERNEL_HEADERS_5_10
> + default "4.14.336" if BR2_KERNEL_HEADERS_4_14
> + default "4.19.304" if BR2_KERNEL_HEADERS_4_19
> + default "5.4.266" if BR2_KERNEL_HEADERS_5_4
> + default "5.10.207" if BR2_KERNEL_HEADERS_5_10
> default "5.15.146" if BR2_KERNEL_HEADERS_5_15
FYI, your commit message mentions that you were updating 5.15.x as well,
but you didn't? Was that on purpose?
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series
2024-01-13 16:26 [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Bernd Kuhls
` (4 preceding siblings ...)
2024-01-14 16:36 ` Peter Korsgaard
@ 2024-01-14 16:37 ` Peter Korsgaard
[not found] ` <875xzvna6v.fsf__46587.6769552537$1705250246$gmane$org@48ers.dk>
6 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2024-01-14 16:37 UTC (permalink / raw)
To: Bernd Kuhls
Cc: Thomas Petazzoni, Romain Naour, Giulio Benetti,
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.11.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread[parent not found: <875xzvna6v.fsf__46587.6769552537$1705250246$gmane$org@48ers.dk>]
* Re: [Buildroot] [PATCH 1/4] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series
[not found] ` <875xzvna6v.fsf__46587.6769552537$1705250246$gmane$org@48ers.dk>
@ 2024-01-14 16:58 ` Bernd Kuhls
0 siblings, 0 replies; 10+ messages in thread
From: Bernd Kuhls @ 2024-01-14 16:58 UTC (permalink / raw)
To: buildroot
Am Sun, 14 Jan 2024 17:36:56 +0100 schrieb Peter Korsgaard:
> > default "5.15.146" if BR2_KERNEL_HEADERS_5_15
>
> FYI, your commit message mentions that you were updating 5.15.x as well,
> but you didn't? Was that on purpose?
Hi Peter,
no, it was a copy'n'paste error, sorry.
Regards, Bernd
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread