diff --git a/linux/linux.hash b/linux/linux.hash index 68bc458c71..4dc1504be6 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 21817f1998e2230f81f7e4f605fa6fdcb040e14fa27d99c27ddb16ce749797a9 linux-6.14.6.tar.xz sha256 611fbb669cf5539da48137a9c052becd499f3f862afaf21ab84cea3966221242 linux-6.13.12.tar.xz sha256 e8a099182562aecff781de72ce769461e706d97af42d740dff20eb450dd5771e linux-6.12.28.tar.xz sha256 ff856748671629c1fefef219099e0b4b81131c2d325e768cb0806e204157014e linux-6.6.90.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6fd591eb69..f788f9ca44 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_13 + default BR2_KERNEL_HEADERS_6_14 help Select the kernel version to get headers from. @@ -51,6 +51,10 @@ config BR2_KERNEL_HEADERS_6_12 config BR2_KERNEL_HEADERS_6_13 bool "Linux 6.13.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 + +config BR2_KERNEL_HEADERS_6_14 + bool "Linux 6.14.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -129,8 +133,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_14 + bool "6.14.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_13 - bool "6.13.x or later" + bool "6.13.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12 @@ -443,6 +451,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.6.90" if BR2_KERNEL_HEADERS_6_6 default "6.12.28" if BR2_KERNEL_HEADERS_6_12 default "6.13.12" if BR2_KERNEL_HEADERS_6_13 + default "6.14.6" if BR2_KERNEL_HEADERS_6_14 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 2290d13ad0..89eaa7b618 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -649,6 +649,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -662,6 +666,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 default "6.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 default "6.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 default "6.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index e1ecf06e4a..94ea3b82de 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -166,8 +166,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_14 + bool "6.14.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_14 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_13 - bool "6.13.x or later" + bool "6.13.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_13 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_12