* [Buildroot] [PATCH 1/2] package/linux-headers: drop 6.5.x option
@ 2023-12-17 17:18 Bernd Kuhls
2023-12-17 17:18 ` [Buildroot] [PATCH 2/2] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Bernd Kuhls
2023-12-18 7:44 ` [Buildroot] [PATCH 1/2] package/linux-headers: drop 6.5.x option Peter Korsgaard
0 siblings, 2 replies; 4+ messages in thread
From: Bernd Kuhls @ 2023-12-17 17:18 UTC (permalink / raw)
To: buildroot
The 6.5.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 -
| 1 -
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 312d53943c..4689226290 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_5
+ bool "kernel headers version 6.5.x are no longer supported"
+ select BR2_LEGACY
+ help
+ Version 6.5.x of the Linux kernel headers are no longer
+ maintained upstream and are now removed.
+
config BR2_PACKAGE_PYTHON_PYXB
bool "python-pyxb removed"
select BR2_LEGACY
diff --git a/linux/linux.hash b/linux/linux.hash
index ed9c6143db..9572acda2d 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 28edfc3d4f90cd738f2a20f5a2d68510268176d6111f6278d8f495edfd9495a7 linux-6.6.3.tar.xz
-sha256 78fbd43822f4c56bc16e89e8874767f592532e1a0ffcd1af4dd279559b5fcbb5 linux-6.5.13.tar.xz
sha256 629daa38f3ea67f29610bfbd53f9f38f46834d3654451e9474100490c66dc7e7 linux-6.1.64.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 be2bee8b346f3ccb35879f16c80a323edda571e36190403805c14a9ea24e4a47 linux-5.15.140.tar.xz
--git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 344acc9cde..ab923cbb95 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -418,7 +418,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "5.10.202" if BR2_KERNEL_HEADERS_5_10
default "5.15.140" if BR2_KERNEL_HEADERS_5_15
default "6.1.64" if BR2_KERNEL_HEADERS_6_1
- default "6.5.13" if BR2_KERNEL_HEADERS_6_5
default "6.6.3" if BR2_KERNEL_HEADERS_6_6
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* [Buildroot] [PATCH 2/2] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series
2023-12-17 17:18 [Buildroot] [PATCH 1/2] package/linux-headers: drop 6.5.x option Bernd Kuhls
@ 2023-12-17 17:18 ` Bernd Kuhls
2023-12-18 7:44 ` Peter Korsgaard
2023-12-18 7:44 ` [Buildroot] [PATCH 1/2] package/linux-headers: drop 6.5.x option Peter Korsgaard
1 sibling, 1 reply; 4+ messages in thread
From: Bernd Kuhls @ 2023-12-17 17:18 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
linux/Config.in | 2 +-
linux/linux.hash | 14 +++++++-------
| 14 +++++++-------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index ae734c49a0..f076ef5b5e 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -128,7 +128,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
- default "6.6.3" if BR2_LINUX_KERNEL_LATEST_VERSION
+ default "6.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 \
diff --git a/linux/linux.hash b/linux/linux.hash
index 9572acda2d..4bd5261439 100644
--- a/linux/linux.hash
+++ b/linux/linux.hash
@@ -1,13 +1,13 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256 28edfc3d4f90cd738f2a20f5a2d68510268176d6111f6278d8f495edfd9495a7 linux-6.6.3.tar.xz
-sha256 629daa38f3ea67f29610bfbd53f9f38f46834d3654451e9474100490c66dc7e7 linux-6.1.64.tar.xz
+sha256 0ce68ec6019019140043263520955ecd04839e55a1baab2fa9155b42bb6fd841 linux-6.6.7.tar.xz
+sha256 365ff26a30e206de9b18489f45d38582a0a61b7c5919f8ab89295a47316784e1 linux-6.1.68.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256 be2bee8b346f3ccb35879f16c80a323edda571e36190403805c14a9ea24e4a47 linux-5.15.140.tar.xz
-sha256 3212e0299d699dd6089505b1428bcb00643fbf19af69806e37fad22bfe12fa8b linux-5.10.202.tar.xz
-sha256 7d3eaa0744456ab4b062e6da8764f776b6939b89a1dfccbe11fbeef9c6e864dc linux-5.4.262.tar.xz
+sha256 096bb16ec07232f27f6a07998c41b655883a8d0a6bb613d39bf524a9ffd99e02 linux-5.15.143.tar.xz
+sha256 ff950750b1060f65c0dde7d4d89238937d80faddf3bcf9ba28189d917daccaee linux-5.10.204.tar.xz
+sha256 d39c90dd9297a36aab7246b516f61e21493826004011f161090bce84db21b6b0 linux-5.4.264.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
-sha256 a8419582886120407f57d39280ef8a9b22aab9725c83c4fe25ecca4712d59346 linux-4.19.300.tar.xz
-sha256 39dcdceecad2ca7347e2b2e7e30a189558c0a1700f793822389bb1fd9a40530f linux-4.14.331.tar.xz
+sha256 53d33c0042eff3700b7f59bdac06295c98c50056fce72f630438974b46bd73ce linux-4.19.302.tar.xz
+sha256 66337a2afdc32e5935294139765c99ef878eedbfe1495f3f3625c23cadcab648 linux-4.14.333.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 ab923cbb95..574b9be84f 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -412,13 +412,13 @@ endchoice
config BR2_DEFAULT_KERNEL_HEADERS
string
- default "4.14.331" if BR2_KERNEL_HEADERS_4_14
- default "4.19.300" if BR2_KERNEL_HEADERS_4_19
- default "5.4.262" if BR2_KERNEL_HEADERS_5_4
- default "5.10.202" if BR2_KERNEL_HEADERS_5_10
- default "5.15.140" if BR2_KERNEL_HEADERS_5_15
- default "6.1.64" if BR2_KERNEL_HEADERS_6_1
- default "6.6.3" if BR2_KERNEL_HEADERS_6_6
+ default "4.14.333" if BR2_KERNEL_HEADERS_4_14
+ default "4.19.302" if BR2_KERNEL_HEADERS_4_19
+ default "5.4.264" if BR2_KERNEL_HEADERS_5_4
+ default "5.10.204" if BR2_KERNEL_HEADERS_5_10
+ default "5.15.143" if BR2_KERNEL_HEADERS_5_15
+ default "6.1.68" if BR2_KERNEL_HEADERS_6_1
+ default "6.6.7" if BR2_KERNEL_HEADERS_6_6
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 \
--
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 2/2] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series
2023-12-17 17:18 ` [Buildroot] [PATCH 2/2] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Bernd Kuhls
@ 2023-12-18 7:44 ` Peter Korsgaard
0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2023-12-18 7:44 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: 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] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/linux-headers: drop 6.5.x option
2023-12-17 17:18 [Buildroot] [PATCH 1/2] package/linux-headers: drop 6.5.x option Bernd Kuhls
2023-12-17 17:18 ` [Buildroot] [PATCH 2/2] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Bernd Kuhls
@ 2023-12-18 7:44 ` Peter Korsgaard
1 sibling, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2023-12-18 7:44 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:
> The 6.5.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 -
> package/linux-headers/Config.in.host | 1 -
> 3 files changed, 7 insertions(+), 2 deletions(-)
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 312d53943c..4689226290 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_5
> + bool "kernel headers version 6.5.x are no longer supported"
> + select BR2_LEGACY
> + help
> + Version 6.5.x of the Linux kernel headers are no longer
> + maintained upstream and are now removed.
> +
> config BR2_PACKAGE_PYTHON_PYXB
> bool "python-pyxb removed"
> select BR2_LEGACY
> diff --git a/linux/linux.hash b/linux/linux.hash
> index ed9c6143db..9572acda2d 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 28edfc3d4f90cd738f2a20f5a2d68510268176d6111f6278d8f495edfd9495a7 linux-6.6.3.tar.xz
> -sha256 78fbd43822f4c56bc16e89e8874767f592532e1a0ffcd1af4dd279559b5fcbb5 linux-6.5.13.tar.xz
> sha256 629daa38f3ea67f29610bfbd53f9f38f46834d3654451e9474100490c66dc7e7 linux-6.1.64.tar.xz
> # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
> sha256 be2bee8b346f3ccb35879f16c80a323edda571e36190403805c14a9ea24e4a47 linux-5.15.140.tar.xz
> diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
> index 344acc9cde..ab923cbb95 100644
> --- a/package/linux-headers/Config.in.host
> +++ b/package/linux-headers/Config.in.host
> @@ -418,7 +418,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
> default "5.10.202" if BR2_KERNEL_HEADERS_5_10
> default "5.15.140" if BR2_KERNEL_HEADERS_5_15
> default "6.1.64" if BR2_KERNEL_HEADERS_6_1
> - default "6.5.13" if BR2_KERNEL_HEADERS_6_5
You forgot to remove the BR2_KERNEL_HEADERS_6_5 option higher up in the
file. Committed with that fixed, 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
end of thread, other threads:[~2023-12-18 7:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-17 17:18 [Buildroot] [PATCH 1/2] package/linux-headers: drop 6.5.x option Bernd Kuhls
2023-12-17 17:18 ` [Buildroot] [PATCH 2/2] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Bernd Kuhls
2023-12-18 7:44 ` Peter Korsgaard
2023-12-18 7:44 ` [Buildroot] [PATCH 1/2] package/linux-headers: drop 6.5.x option Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox