Skip to contentSkip to conversation

{linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series

PATCH Applied Peter Korsgaard 2 participants 4 messages May 4, 2022 – May 28, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 {linux, linux-headers}: bump 4.{9, 14, 19}.x / 5.{4, 10, 15, 16}.x series

---
 linux/Config.in                      |  2 +-
 linux/linux.hash                     | 14 +++++++-------
 package/linux-headers/Config.in.host | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)
linux/Config.in +1 -1
index 82f5675f6c..c37b4cd422 100644
@@ -128,7 +128,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "5.15.33" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "5.15.37" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
linux/linux.hash +7 -7
index cf7ccc5cc5..077bc4d4d7 100644
@@ -1,13 +1,13 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256  da6d2cfa8b5b82d8a17b032a627fc1c7885097523c32cc8a4294745697d59b7e  linux-5.16.19.tar.xz
-sha256  c30a17e6090f9ebf2d8ff58cd6c92c7324b1f4a8b3aa6a7f68850310af05a9c4  linux-5.15.33.tar.xz
-sha256  dbef6a06325433481551cb8cfca9254d908d0ae950bc809f3da8ade00c485693  linux-5.10.110.tar.xz
-sha256  9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc  linux-5.4.188.tar.xz
+sha256  d8060dc88f862baaae66b42a2dbc12298ed667c698eb5c55617a7786ee47bf25  linux-5.16.20.tar.xz
+sha256  18bf091a2157faa8d92a1aba2ecb66b5124bb0e033fc7797343984e069a2c026  linux-5.15.37.tar.xz
+sha256  82516a02bb52456f6e8057217dde6e02b78003b1e058117557c2ae9661696dfc  linux-5.10.113.tar.xz
+sha256  288ca85fcdad18e950ccbe3d640594ee36d5aac226321ed935076fadb0cc0a3a  linux-5.4.191.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
 sha256  35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3  linux-4.4.302.tar.xz
-sha256  e86a55a89e1e28756b890b2b78f8b582d05cecb3509ff5c353e9534866468614  linux-4.9.309.tar.xz
-sha256  100a9960fb2d8e079c9feeef640715a7fb749ed728a57e427f9e2443212e58f9  linux-4.14.275.tar.xz
-sha256  bafff35102cc486ec2bf94c6d908be8e24017b2e4a1873f52f24c855eb220cd8  linux-4.19.237.tar.xz
+sha256  fa2fb1fb5ba2e6ed99603063474804bd5fddeb8a5ad769d47786f82109e5c627  linux-4.9.312.tar.xz
+sha256  e3dcacc2459c91586ae94121f54eb54a7cae9c424766fe20498169f682fd1b15  linux-4.14.277.tar.xz
+sha256  4c6269d3c14e593151b035a55227110e632642d848032ef6992135c18488fe13  linux-4.19.241.tar.xz
 # Locally computed
 sha256  63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e  linux-cip-5.10.104-cip3.tar.gz
 sha256  9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e  linux-cip-5.10.104-cip3-rt3.tar.gz
package/linux-headers/Config.in.host +7 -7
index 43a116974b..229c5a0ca8 100644
@@ -382,13 +382,13 @@ endchoice
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
 	default "4.4.302"	if BR2_KERNEL_HEADERS_4_4
-	default "4.9.309"	if BR2_KERNEL_HEADERS_4_9
-	default "4.14.275"	if BR2_KERNEL_HEADERS_4_14
-	default "4.19.237"	if BR2_KERNEL_HEADERS_4_19
-	default "5.4.188"	if BR2_KERNEL_HEADERS_5_4
-	default "5.10.110"	if BR2_KERNEL_HEADERS_5_10
-	default "5.15.33"	if BR2_KERNEL_HEADERS_5_15
-	default "5.16.19"	if BR2_KERNEL_HEADERS_5_16
+	default "4.9.312"	if BR2_KERNEL_HEADERS_4_9
+	default "4.14.277"	if BR2_KERNEL_HEADERS_4_14
+	default "4.19.241"	if BR2_KERNEL_HEADERS_4_19
+	default "5.4.191"	if BR2_KERNEL_HEADERS_5_4
+	default "5.10.113"	if BR2_KERNEL_HEADERS_5_10
+	default "5.15.37"	if BR2_KERNEL_HEADERS_5_15
+	default "5.16.20"	if BR2_KERNEL_HEADERS_5_16
 	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 \
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 package/linux-headers: drop 4.4.x option

The 4.4.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it.

---
 Config.in.legacy                     | 7 +++++++
 linux/linux.hash                     | 1 -
 package/linux-headers/Config.in.host | 7 -------
 3 files changed, 7 insertions(+), 8 deletions(-)
Config.in.legacy +7 -0
index 6d2c82ab7f..806e995bd1 100644
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2022.05"
 
+config BR2_KERNEL_HEADERS_4_4
+	bool "kernel headers version 4.4.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 4.4.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
 config BR2_BINUTILS_VERSION_2_32_X
 	bool "binutils 2.32.x has been removed"
 	select BR2_LEGACY
linux/linux.hash +0 -1
index 077bc4d4d7..7a3308546f 100644
@@ -4,7 +4,6 @@ sha256  18bf091a2157faa8d92a1aba2ecb66b5124bb0e033fc7797343984e069a2c026  linux-
 sha256  82516a02bb52456f6e8057217dde6e02b78003b1e058117557c2ae9661696dfc  linux-5.10.113.tar.xz
 sha256  288ca85fcdad18e950ccbe3d640594ee36d5aac226321ed935076fadb0cc0a3a  linux-5.4.191.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
-sha256  35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3  linux-4.4.302.tar.xz
 sha256  fa2fb1fb5ba2e6ed99603063474804bd5fddeb8a5ad769d47786f82109e5c627  linux-4.9.312.tar.xz
 sha256  e3dcacc2459c91586ae94121f54eb54a7cae9c424766fe20498169f682fd1b15  linux-4.14.277.tar.xz
 sha256  4c6269d3c14e593151b035a55227110e632642d848032ef6992135c18488fe13  linux-4.19.241.tar.xz
package/linux-headers/Config.in.host +0 -7
index 229c5a0ca8..b030996dff 100644
@@ -27,12 +27,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_4
-	bool "Linux 4.4.x kernel headers"
-	depends on !BR2_riscv
-	depends on !BR2_csky
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
-
 config BR2_KERNEL_HEADERS_4_9
 	bool "Linux 4.9.x kernel headers"
 	depends on !BR2_riscv
@@ -381,7 +375,6 @@ endchoice
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "4.4.302"	if BR2_KERNEL_HEADERS_4_4
 	default "4.9.312"	if BR2_KERNEL_HEADERS_4_9
 	default "4.14.277"	if BR2_KERNEL_HEADERS_4_14
 	default "4.19.241"	if BR2_KERNEL_HEADERS_4_19
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
In reply to Peter Korsgaard
Quoted 1 line · Peter Korsgaard

Applied both to master, thanks.

Regards,
Arnout

Quoted 59 lines
---
  linux/Config.in                      |  2 +-
  linux/linux.hash                     | 14 +++++++-------
  package/linux-headers/Config.in.host | 14 +++++++-------
  3 files changed, 15 insertions(+), 15 deletions(-)
linux/Config.in +1 -1
index 82f5675f6c..c37b4cd422 100644
@@ -128,7 +128,7 @@ endif
 
  config BR2_LINUX_KERNEL_VERSION
  	string
-	default "5.15.33" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "5.15.37" if BR2_LINUX_KERNEL_LATEST_VERSION
  	default "5.10.104-cip3" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
  	default "5.10.104-cip3-rt3" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
  	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
linux/linux.hash +7 -7
index cf7ccc5cc5..077bc4d4d7 100644
@@ -1,13 +1,13 @@
  # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256  da6d2cfa8b5b82d8a17b032a627fc1c7885097523c32cc8a4294745697d59b7e  linux-5.16.19.tar.xz
-sha256  c30a17e6090f9ebf2d8ff58cd6c92c7324b1f4a8b3aa6a7f68850310af05a9c4  linux-5.15.33.tar.xz
-sha256  dbef6a06325433481551cb8cfca9254d908d0ae950bc809f3da8ade00c485693  linux-5.10.110.tar.xz
-sha256  9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc  linux-5.4.188.tar.xz
+sha256  d8060dc88f862baaae66b42a2dbc12298ed667c698eb5c55617a7786ee47bf25  linux-5.16.20.tar.xz
+sha256  18bf091a2157faa8d92a1aba2ecb66b5124bb0e033fc7797343984e069a2c026  linux-5.15.37.tar.xz
+sha256  82516a02bb52456f6e8057217dde6e02b78003b1e058117557c2ae9661696dfc  linux-5.10.113.tar.xz
+sha256  288ca85fcdad18e950ccbe3d640594ee36d5aac226321ed935076fadb0cc0a3a  linux-5.4.191.tar.xz
  # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
  sha256  35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3  linux-4.4.302.tar.xz
-sha256  e86a55a89e1e28756b890b2b78f8b582d05cecb3509ff5c353e9534866468614  linux-4.9.309.tar.xz
-sha256  100a9960fb2d8e079c9feeef640715a7fb749ed728a57e427f9e2443212e58f9  linux-4.14.275.tar.xz
-sha256  bafff35102cc486ec2bf94c6d908be8e24017b2e4a1873f52f24c855eb220cd8  linux-4.19.237.tar.xz
+sha256  fa2fb1fb5ba2e6ed99603063474804bd5fddeb8a5ad769d47786f82109e5c627  linux-4.9.312.tar.xz
+sha256  e3dcacc2459c91586ae94121f54eb54a7cae9c424766fe20498169f682fd1b15  linux-4.14.277.tar.xz
+sha256  4c6269d3c14e593151b035a55227110e632642d848032ef6992135c18488fe13  linux-4.19.241.tar.xz
  # Locally computed
  sha256  63e6df81c4a747c60eed535ffc2f6f1ddb0c17ec349e860316d9a700c69ab38e  linux-cip-5.10.104-cip3.tar.gz
  sha256  9a45929d91ebaddbf6a0ef29750775e33d3c3f56f42f0a9e95e77e5b4eba3c6e  linux-cip-5.10.104-cip3-rt3.tar.gz
package/linux-headers/Config.in.host +0 -7
index 43a116974b..229c5a0ca8 100644
@@ -382,13 +382,13 @@ endchoice
  config BR2_DEFAULT_KERNEL_HEADERS
  	string
  	default "4.4.302"	if BR2_KERNEL_HEADERS_4_4
-	default "4.9.309"	if BR2_KERNEL_HEADERS_4_9
-	default "4.14.275"	if BR2_KERNEL_HEADERS_4_14
-	default "4.19.237"	if BR2_KERNEL_HEADERS_4_19
-	default "5.4.188"	if BR2_KERNEL_HEADERS_5_4
-	default "5.10.110"	if BR2_KERNEL_HEADERS_5_10
-	default "5.15.33"	if BR2_KERNEL_HEADERS_5_15
-	default "5.16.19"	if BR2_KERNEL_HEADERS_5_16

package/linux-headers/Config.in.host endchoice · line 394

Quoted 10 lines
package/linux-headers/Config.in.host +7 -0
+	default "4.9.312"	if BR2_KERNEL_HEADERS_4_9
+	default "4.14.277"	if BR2_KERNEL_HEADERS_4_14
+	default "4.19.241"	if BR2_KERNEL_HEADERS_4_19
+	default "5.4.191"	if BR2_KERNEL_HEADERS_5_4
+	default "5.10.113"	if BR2_KERNEL_HEADERS_5_10
+	default "5.15.37"	if BR2_KERNEL_HEADERS_5_15
+	default "5.16.20"	if BR2_KERNEL_HEADERS_5_16
  	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 \

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot