Skip to contentSkip to conversation

{linux, linux-headers}: bump 4.19.x / 5.{2, 3}.x series

PATCH New Peter Korsgaard 1 participant 4 messages Oct 1, 2019 – Oct 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 {linux, linux-headers}: bump 4.19.x / 5.{2, 3}.x series

---
 linux/Config.in                      | 2 +-
 linux/linux.hash                     | 6 +++---
 package/linux-headers/Config.in.host | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
linux/Config.in +1 -1
index 7e236b035b..fc359cedbc 100644
@@ -122,7 +122,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "5.3.1" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "5.3.2" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "v4.19.65-cip8" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
linux/linux.hash +3 -3
index 16aa4db4cd..cb137e67ac 100644
@@ -1,9 +1,9 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256 9890b5a909d316211d045a95f5f0680e39749f2319cb26d7cd067efaa692f858  linux-5.3.1.tar.xz
-sha256 7b3b8ad09ea936b4216dd02c5fc2ef39c8f58935d0a81ab9690f0fc451102df9  linux-5.2.17.tar.xz
+sha256 361f9c953bb5ca7dbc922c3f698170523667f6a2f43961ffb88fa47b6b10fc6b  linux-5.3.2.tar.xz
+sha256 6d090f866c9739403f78b08470209d1e825c44ce5dbaa237a4a2c8c6609dca60  linux-5.2.18.tar.xz
 sha256 56495f82314f0dfb84a3fe7fad78e17be69c4fd36ef46f2452458b2fa1e341f6  linux-5.1.21.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
-sha256 dd5e7147e1e4501560fba5beb86dae6bf6ba843518ab3d4cad283de77b651b78  linux-4.19.75.tar.xz
+sha256 ba4dd29902734b263a5197410363b17f30dc60bc999bd6ce90b6f5910b971e66  linux-4.19.76.tar.xz
 sha256 a3c54b887ea3e679382bd4c0536e6a281b071dab2258bd3ee8af75baef2023f5  linux-4.14.146.tar.xz
 sha256 d5f4bb7584e461f1faa9a3f94c2ad292246fe692b0e992e072dac255f806c2e3  linux-4.9.194.tar.xz
 sha256 d5f4bb7584e461f1faa9a3f94c2ad292246fe692b0e992e072dac255f806c2e3  linux-4.9.194.tar.xz
package/linux-headers/Config.in.host +3 -3
index 39cb849b7f..5942d70576 100644
@@ -316,10 +316,10 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "4.4.194"	if BR2_KERNEL_HEADERS_4_4
 	default "4.9.194"	if BR2_KERNEL_HEADERS_4_9
 	default "4.14.146"	if BR2_KERNEL_HEADERS_4_14
-	default "4.19.75"	if BR2_KERNEL_HEADERS_4_19
+	default "4.19.76"	if BR2_KERNEL_HEADERS_4_19
 	default "5.1.21"	if BR2_KERNEL_HEADERS_5_1
-	default "5.2.17"	if BR2_KERNEL_HEADERS_5_2
-	default "5.3.1"		if BR2_KERNEL_HEADERS_5_3
+	default "5.2.18"	if BR2_KERNEL_HEADERS_5_2
+	default "5.3.2"		if BR2_KERNEL_HEADERS_5_3
 	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 · 1 line
2.20.1
#2 lore raw

PATCH 2/2 package/linux-headers: drop support for 5.1.x headers

In reply to Peter Korsgaard

The 5.1.x series is now EOL and 5.3.x has been added, so remove the option and add legacy handling for it.

---
 Config.in.legacy                     | 7 +++++++
 linux/linux.hash                     | 1 -
 package/linux-headers/Config.in.host | 5 -----
 3 files changed, 7 insertions(+), 6 deletions(-)
Config.in.legacy +7 -0
index aeeeba04dd..e06ba2783b 100644
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2019.11"
 
+config BR2_KERNEL_HEADERS_5_1
+	bool "kernel headers version 5.1.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 5.1.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
 config BR2_PACKAGE_DEVMEM2
 	bool "devmem2 package was removed"
 	select BR2_LEGACY
linux/linux.hash +0 -1
index cb137e67ac..f778517ef4 100644
@@ -1,7 +1,6 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
 sha256 361f9c953bb5ca7dbc922c3f698170523667f6a2f43961ffb88fa47b6b10fc6b  linux-5.3.2.tar.xz
 sha256 6d090f866c9739403f78b08470209d1e825c44ce5dbaa237a4a2c8c6609dca60  linux-5.2.18.tar.xz
-sha256 56495f82314f0dfb84a3fe7fad78e17be69c4fd36ef46f2452458b2fa1e341f6  linux-5.1.21.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
 sha256 ba4dd29902734b263a5197410363b17f30dc60bc999bd6ce90b6f5910b971e66  linux-4.19.76.tar.xz
 sha256 a3c54b887ea3e679382bd4c0536e6a281b071dab2258bd3ee8af75baef2023f5  linux-4.14.146.tar.xz
package/linux-headers/Config.in.host +0 -5
index 5942d70576..2e258afd41 100644
@@ -49,10 +49,6 @@ config BR2_KERNEL_HEADERS_4_19
 	depends on !BR2_csky
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
 
-config BR2_KERNEL_HEADERS_5_1
-	bool "Linux 5.1.x kernel headers"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
-
 config BR2_KERNEL_HEADERS_5_2
 	bool "Linux 5.2.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2
@@ -317,7 +313,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "4.9.194"	if BR2_KERNEL_HEADERS_4_9
 	default "4.14.146"	if BR2_KERNEL_HEADERS_4_14
 	default "4.19.76"	if BR2_KERNEL_HEADERS_4_19
-	default "5.1.21"	if BR2_KERNEL_HEADERS_5_1
 	default "5.2.18"	if BR2_KERNEL_HEADERS_5_2
 	default "5.3.2"		if BR2_KERNEL_HEADERS_5_3
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
Signature · 1 line
2.20.1
#3 lore raw

PATCH 2/2 package/linux-headers: drop support for 5.1.x headers

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

The 5.1.x series is now EOL and 5.3.x has been added, so remove the option and add legacy handling for it.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard