浏览代码

{toolchain, linux-headers}: add support for 5.19 headers

And add (and default to) 5.19.13 to linux-headers.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Peter Korsgaard 2 年之前
父节点
当前提交
0551f23b05

+ 1 - 0
linux/linux.hash

@@ -1,4 +1,5 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
+sha256  4ecdb8b59c6f6f258d89cbf22eede210e0a55c09db884988fe706efe2fe8f148  linux-5.19.13.tar.xz
 sha256  4a1c922a490eeabf5b44d4fde36de9ba5b71711b7352c6258716da41160db628  linux-5.17.15.tar.xz
 sha256  4a1c922a490eeabf5b44d4fde36de9ba5b71711b7352c6258716da41160db628  linux-5.17.15.tar.xz
 sha256  da47d9a80b694548835ccb553b6eb1a1f3f5d5cddd9e2bd6f4886b99ca14f940  linux-5.15.67.tar.xz
 sha256  da47d9a80b694548835ccb553b6eb1a1f3f5d5cddd9e2bd6f4886b99ca14f940  linux-5.15.67.tar.xz
 sha256  3f47ebdb9afe152a0c32c1157336ef13fa5cc08ac6d884dfc1f6ddc2b7dba268  linux-5.10.142.tar.xz
 sha256  3f47ebdb9afe152a0c32c1157336ef13fa5cc08ac6d884dfc1f6ddc2b7dba268  linux-5.10.142.tar.xz

+ 11 - 2
package/linux-headers/Config.in.host

@@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
 choice
 choice
 	prompt "Kernel Headers"
 	prompt "Kernel Headers"
 	default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
 	default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
-	default BR2_KERNEL_HEADERS_5_17
+	default BR2_KERNEL_HEADERS_5_19
 	help
 	help
 	  Select the kernel version to get headers from.
 	  Select the kernel version to get headers from.
 
 
@@ -56,6 +56,10 @@ config BR2_KERNEL_HEADERS_5_15
 config BR2_KERNEL_HEADERS_5_17
 config BR2_KERNEL_HEADERS_5_17
 	bool "Linux 5.17.x kernel headers"
 	bool "Linux 5.17.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
+
+config BR2_KERNEL_HEADERS_5_19
+	bool "Linux 5.19.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
 	select BR2_KERNEL_HEADERS_LATEST
 	select BR2_KERNEL_HEADERS_LATEST
 
 
 config BR2_KERNEL_HEADERS_VERSION
 config BR2_KERNEL_HEADERS_VERSION
@@ -133,8 +137,12 @@ choice
 	  If your kernel headers are more recent than the latest version
 	  If your kernel headers are more recent than the latest version
 	  in the choice, then select the latest version.
 	  in the choice, then select the latest version.
 
 
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19
+	bool "5.19.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_18
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_18
-	bool "5.18.x or later"
+	bool "5.18.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 
 
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17
@@ -387,6 +395,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "5.10.142"	if BR2_KERNEL_HEADERS_5_10
 	default "5.10.142"	if BR2_KERNEL_HEADERS_5_10
 	default "5.15.67"	if BR2_KERNEL_HEADERS_5_15
 	default "5.15.67"	if BR2_KERNEL_HEADERS_5_15
 	default "5.17.15"	if BR2_KERNEL_HEADERS_5_17
 	default "5.17.15"	if BR2_KERNEL_HEADERS_5_17
+	default "5.19.13"	if BR2_KERNEL_HEADERS_5_19
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
 	default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
 	default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \

+ 5 - 0
toolchain/Config.in

@@ -571,6 +571,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 	bool
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 	select BR2_TOOLCHAIN_HEADERS_LATEST
 	select BR2_TOOLCHAIN_HEADERS_LATEST
 
 
 # This should be selected by the latest version, above, to indicate that
 # This should be selected by the latest version, above, to indicate that
@@ -584,6 +588,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
 # stops affecting a value on the first matching default.
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
 	string
 	string
+	default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
 	default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 	default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 	default "5.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 	default "5.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 	default "5.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16
 	default "5.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16

+ 5 - 1
toolchain/toolchain-external/toolchain-external-custom/Config.in.options

@@ -127,8 +127,12 @@ choice
 	  If your toolchain uses headers newer than the latest version
 	  If your toolchain uses headers newer than the latest version
 	  in the choice, then select the latest version.
 	  in the choice, then select the latest version.
 
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_19
+	bool "5.19.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_18
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_18
-	bool "5.18.x or later"
+	bool "5.18.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 
 
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_17
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_17