Skip to contentSkip to conversation

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

PATCH Superseded Petr Vorel 1 participant 1 message Jan 6, 2021

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

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

Drop 5.9 stable (EOL)

---
Change v1->v2:
Fix 5.10.5 as default (reported by Bernd Kuhls).

Kind regards,
Petr

 linux/Config.in                      |  2 +-
 linux/linux.hash                     | 13 ++++++-------
 package/linux-headers/Config.in.host | 17 ++++++-----------
 3 files changed, 13 insertions(+), 19 deletions(-)
linux/Config.in +1 -1
index 92b0543515..c1bdad0e92 100644
@@ -125,7 +125,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "5.10.3" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "5.10.5" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default "4.19.152-cip37-rt16" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
linux/linux.hash +6 -7
index cb702146bd..72fd1a2df0 100644
@@ -1,12 +1,11 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256  f9153333e5ce60c9cd9a501fbcb342ba6032b8fdb2cb492115c5595712a19525  linux-5.10.3.tar.xz
-sha256  b0d7abae88e5f91893627c645e680a95c818defd1b4fcaf3e2afb4b2b6b4ab86  linux-5.9.16.tar.xz
-sha256  1de3586d8e7a9a814726610745d80907a267590d2770ec1079ef2875c4984008  linux-5.4.85.tar.xz
+sha256  2ed25911e9254cfd915895773bb5917dbb226e15d55a66c80ec861cba30f7b51  linux-5.10.5.tar.gz
+sha256  6a34e93e2e84bb645155124962307ad9d3646124f43838d087209ed4ea595c31  linux-5.4.87.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
-sha256  e52a49ceb639d871478a143c314648c35e22222c317ecdf49866830fea5c3dfc  linux-4.4.248.tar.xz
-sha256  4687268061c9933c298b30d28e4bf1a30dfbab7c0da4bee194968e4f81ffeccf  linux-4.9.248.tar.xz
-sha256  0e1bc32c4842c3bbee3a15454408f528acd4d3c5e83312b93008d5ee2e9a0c79  linux-4.14.212.tar.xz
-sha256  3eeec4e5eb8a129be3536357ecb028fae7d82fac933dcfac0b6089ee398fc5fc  linux-4.19.163.tar.xz
+sha256  31c0ff31cd09ea74e2ad58461f80afb00e2b137e0420e39a8dea1b15df26eb12  linux-4.4.249.tar.xz
+sha256  b1f38696ff5bce89e1d8248126aa2a8ce5b19100efdd68f1d335a9f736e04c4e  linux-4.9.249.tar.xz
+sha256  fd7bcedb79feb1378b89b257e68bfb86cb0aeb23380808c6a7e84a12e8ec2a1d  linux-4.14.213.tar.xz
+sha256  a1c05649b0f28d041c34d09d710d2d18f83d42fea4eb90569320d216d4e4e2d0  linux-4.19.165.tar.xz
 # Locally computed
 sha256  d2a06f52143deb929b8d513cf9afc9bd065951389a80fa70bc4d63025b5b3fb9  linux-cip-4.19.152-cip37.tar.gz
 sha256  bc1dacd3d0f526de3e8754a444e8e02a54521527af639ddb907cb35cda775a8c  linux-cip-4.19.152-cip37-rt16.tar.gz
package/linux-headers/Config.in.host +6 -11
index 7b27cee036..af5030554e 100644
@@ -54,10 +54,6 @@ config BR2_KERNEL_HEADERS_5_4
 	bool "Linux 5.4.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
 
-config BR2_KERNEL_HEADERS_5_9
-	bool "Linux 5.9.x kernel headers"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9
-
 config BR2_KERNEL_HEADERS_5_10
 	bool "Linux 5.10.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10
@@ -350,13 +346,12 @@ endchoice
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "4.4.248"	if BR2_KERNEL_HEADERS_4_4
-	default "4.9.248"	if BR2_KERNEL_HEADERS_4_9
-	default "4.14.212"	if BR2_KERNEL_HEADERS_4_14
-	default "4.19.163"	if BR2_KERNEL_HEADERS_4_19
-	default "5.4.85"	if BR2_KERNEL_HEADERS_5_4
-	default "5.9.16"	if BR2_KERNEL_HEADERS_5_9
-	default "5.10.3"	if BR2_KERNEL_HEADERS_5_10
+	default "4.4.249"	if BR2_KERNEL_HEADERS_4_4
+	default "4.9.249"	if BR2_KERNEL_HEADERS_4_9
+	default "4.14.213"	if BR2_KERNEL_HEADERS_4_14
+	default "4.19.165"	if BR2_KERNEL_HEADERS_4_19
+	default "5.4.87"	if BR2_KERNEL_HEADERS_5_4
+	default "5.10.5"	if BR2_KERNEL_HEADERS_5_10
 	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.28.0