2
1
Эх сурвалжийг харах

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

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

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
Bernd Kuhls 3 сар өмнө
parent
commit
76d25d365b

+ 1 - 0
linux/linux.hash

@@ -1,4 +1,5 @@
 # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
 # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
+sha256  9b607166a1c999d8326098121222feb080a20a3253975fcdfa2de96ba7f757a7  linux-6.17.tar.xz
 sha256  7ac8c8a3cf05476375deaaa85dfcee095a826ffe557b437f43774fc3b64ce58d  linux-6.16.9.tar.xz
 sha256  7ac8c8a3cf05476375deaaa85dfcee095a826ffe557b437f43774fc3b64ce58d  linux-6.16.9.tar.xz
 sha256  234621e146dacce2241049555d550e4f7a6bde67ccd7ef232d47ac8145425526  linux-6.12.49.tar.xz
 sha256  234621e146dacce2241049555d550e4f7a6bde67ccd7ef232d47ac8145425526  linux-6.12.49.tar.xz
 sha256  601cd332aa695d16607b353feff369b4a0b36d111be077e8af54bdd41e1968a6  linux-6.6.108.tar.xz
 sha256  601cd332aa695d16607b353feff369b4a0b36d111be077e8af54bdd41e1968a6  linux-6.6.108.tar.xz

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

@@ -3,7 +3,7 @@ comment "Kernel Header Options"
 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_6_16
+	default BR2_KERNEL_HEADERS_6_17
 	help
 	help
 	  Select the kernel version to get headers from.
 	  Select the kernel version to get headers from.
 
 
@@ -57,6 +57,10 @@ config BR2_KERNEL_HEADERS_6_12
 config BR2_KERNEL_HEADERS_6_16
 config BR2_KERNEL_HEADERS_6_16
 	bool "Linux 6.16.x kernel headers"
 	bool "Linux 6.16.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16
+
+config BR2_KERNEL_HEADERS_6_17
+	bool "Linux 6.17.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17
 	select BR2_KERNEL_HEADERS_LATEST
 	select BR2_KERNEL_HEADERS_LATEST
 
 
 config BR2_KERNEL_HEADERS_VERSION
 config BR2_KERNEL_HEADERS_VERSION
@@ -135,8 +139,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_6_17
+	bool "6.17.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_16
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_16
-	bool "6.16.x or later"
+	bool "6.16.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16
 
 
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_15
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_15
@@ -461,6 +469,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "6.6.108"	if BR2_KERNEL_HEADERS_6_6
 	default "6.6.108"	if BR2_KERNEL_HEADERS_6_6
 	default "6.12.49"	if BR2_KERNEL_HEADERS_6_12
 	default "6.12.49"	if BR2_KERNEL_HEADERS_6_12
 	default "6.16.9"	if BR2_KERNEL_HEADERS_6_16
 	default "6.16.9"	if BR2_KERNEL_HEADERS_6_16
+	default "6.17"		if BR2_KERNEL_HEADERS_6_17
 	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

@@ -671,6 +671,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16
 	bool
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16
 	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
@@ -684,6 +688,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 "6.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17
 	default "6.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16
 	default "6.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16
 	default "6.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15
 	default "6.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_15
 	default "6.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14
 	default "6.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14

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

@@ -173,8 +173,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_6_17
+	bool "6.17.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_16
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_16
-	bool "6.16.x or later"
+	bool "6.16.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_16
 
 
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_15
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_15