diff --git a/linux/linux.hash b/linux/linux.hash index 43c9314a23..cab7b30385 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 c7dded14e368834b18bb2ad64af65560d8bcb9d2d6597e0f6ef151fded01e577 linux-6.2.13.tar.xz sha256 dfdcc143a879d64a5ee99213b2b4b05b5dccd566c144df93bca1e204df64c110 linux-6.1.26.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 066c4bbcbe3c480068a2e302f52b1708f340ecaaf633ec43d7f791bbeac5771a linux-5.15.109.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e102369395..cb614d0eef 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_1 + default BR2_KERNEL_HEADERS_6_2 help Select the kernel version to get headers from. @@ -48,6 +48,10 @@ config BR2_KERNEL_HEADERS_5_15 config BR2_KERNEL_HEADERS_6_1 bool "Linux 6.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + +config BR2_KERNEL_HEADERS_6_2 + bool "Linux 6.2.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -125,8 +129,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_2 + bool "6.2.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1 - bool "6.1.x or later" + bool "6.1.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0 @@ -390,6 +398,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.10.179" if BR2_KERNEL_HEADERS_5_10 default "5.15.109" if BR2_KERNEL_HEADERS_5_15 default "6.1.26" if BR2_KERNEL_HEADERS_6_1 + default "6.2.13" if BR2_KERNEL_HEADERS_6_2 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 \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 08e4ccad9e..80b2dbde4d 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -600,6 +600,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -613,6 +617,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.2" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 default "6.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1c39334ddd..8f3905b8d7 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -127,8 +127,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_2 + bool "6.2.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_1 - bool "6.1.x or later" + bool "6.1.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_0