All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 4}.x series
@ 2023-09-22 19:33 Bernd Kuhls
  2023-09-22 19:33 ` [Buildroot] [PATCH 2/3] {toolchain, linux-headers}: add support for 6.5 headers Bernd Kuhls
                   ` (2 more replies)
  0 siblings, 3 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

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 linux/Config.in                      | 2 +-
 linux/linux.hash                     | 8 ++++----
 package/linux-headers/Config.in.host | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/linux/Config.in b/linux/Config.in
index 90ab048055..7ddcf013f8 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -128,7 +128,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "6.4.14" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "6.4.16" 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 d62fc7de09..ecd3492c43 100644
--- a/linux/linux.hash
+++ b/linux/linux.hash
@@ -1,9 +1,9 @@
 # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  75eae323747ae37b05086c5a51326a744eb611b0e890e7ebe77de362b30450e6  linux-6.4.14.tar.xz
-sha256  58b0446d8ea4bc0b26a35e2e3509bd53efcdeb295c9e4f48d33a23b1cdaa103b  linux-6.1.51.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  ab464e4107329ff5262f1c585c40fc29dc68f17687a9a918f3e90faba5303d62  linux-5.15.130.tar.xz
-sha256  240d5e47bb378c6813ecd07704fb887651ea7617159d2771071fd70bf33cd995  linux-5.10.194.tar.xz
+sha256  4177b5c4d6e749bb8339ac4aa68eb0932ead9490b956a80d9a597089959618ac  linux-5.15.132.tar.xz
+sha256  71ec2e3af082bcd7c4aac4b8ecdbc2e47695befe4984e3e5567791a605a96fc0  linux-5.10.196.tar.xz
 sha256  c7a4086ba23507b8539d18534565de0d6591138bfa2e449e93964fd5132e353a  linux-5.4.256.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
 sha256  ccadbde939a788934436125a1ecd4464175b68ebe6c18072fbc90c8596eea00f  linux-4.19.294.tar.xz
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 7e67dfad5c..3eb47e315b 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -403,10 +403,10 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "4.14.325"	if BR2_KERNEL_HEADERS_4_14
 	default "4.19.294"	if BR2_KERNEL_HEADERS_4_19
 	default "5.4.256"	if BR2_KERNEL_HEADERS_5_4
-	default "5.10.194"	if BR2_KERNEL_HEADERS_5_10
-	default "5.15.130"	if BR2_KERNEL_HEADERS_5_15
-	default "6.1.51"	if BR2_KERNEL_HEADERS_6_1
-	default "6.4.14"	if BR2_KERNEL_HEADERS_6_4
+	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 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
* [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 +
 package/linux-headers/Config.in.host                | 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
diff --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 -
 package/linux-headers/Config.in.host | 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
diff --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
end of thread, other threads:[~2023-09-30 10:29 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [Buildroot] [PATCH 1/3] {linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 4}.x series Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.