diff --git a/Config.in.legacy b/Config.in.legacy index b8a95fd8129..4894fe70651 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2026.08" +config BR2_KERNEL_HEADERS_7_0 + bool "kernel headers version 7.0.x are no longer supported" + select BR2_LEGACY + help + Version 7.0.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP bool "bluez sap plugin removed" select BR2_LEGACY diff --git a/linux/7.1.1 b/linux/7.1.2 similarity index 100% rename from linux/7.1.1 rename to linux/7.1.2 diff --git a/linux/Config.in b/linux/Config.in index 0aa35bd028f..320a2c55747 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -143,7 +143,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "7.1.1" if BR2_LINUX_KERNEL_LATEST_VERSION + default "7.1.2" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.254-cip72" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.254-cip72-rt32" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/from-6.17/linux.hash b/linux/from-6.17/linux.hash index 33ee9dc232c..2d6ab0f28a5 100644 --- a/linux/from-6.17/linux.hash +++ b/linux/from-6.17/linux.hash @@ -1,9 +1,8 @@ # From https://www.kernel.org/pub/linux/kernel/v7.x/sha256sums.asc -sha256 5215fa3541dc7e7f5bcd51bf7e57f169cec6fce508ca54e3dc85fdee14371d7d linux-7.1.1.tar.xz -sha256 3c81edd0f716aca3dd48dff691681827580cc53d35a8eec3be47d346d1f89913 linux-7.0.13.tar.xz +sha256 37198c93727be247c9fb5309bb86cd5e496c61e5322cd8c4eca9476bb0b5883f linux-7.1.2.tar.xz # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 fbab86c9f471c81075b280cca30bd85d790c060063a1245859b6344b07c9c44e linux-6.18.36.tar.xz +sha256 a83cd200e6646db52866b8309e9137b9e9048b613cbda10ced2b811aae125255 linux-6.18.37.tar.xz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING diff --git a/package/linux-headers/6.18.36 b/package/linux-headers/6.18.37 similarity index 100% rename from package/linux-headers/6.18.36 rename to package/linux-headers/6.18.37 diff --git a/package/linux-headers/7.1.1 b/package/linux-headers/7.1.1 deleted file mode 120000 index a4e1d3ec9c8..00000000000 --- a/package/linux-headers/7.1.1 +++ /dev/null @@ -1 +0,0 @@ -../../linux/from-6.17 \ No newline at end of file diff --git a/package/linux-headers/7.0.13 b/package/linux-headers/7.1.2 similarity index 100% rename from package/linux-headers/7.0.13 rename to package/linux-headers/7.1.2 diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a890c8f161f..d1eb93ce1c4 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -52,10 +52,6 @@ config BR2_KERNEL_HEADERS_6_18 bool "Linux 6.18.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18 -config BR2_KERNEL_HEADERS_7_0 - bool "Linux 7.0.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0 - config BR2_KERNEL_HEADERS_7_1 bool "Linux 7.1.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1 @@ -481,9 +477,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.1.176" if BR2_KERNEL_HEADERS_6_1 default "6.6.143" if BR2_KERNEL_HEADERS_6_6 default "6.12.94" if BR2_KERNEL_HEADERS_6_12 - default "6.18.36" if BR2_KERNEL_HEADERS_6_18 - default "7.0.13" if BR2_KERNEL_HEADERS_7_0 - default "7.1.1" if BR2_KERNEL_HEADERS_7_1 + default "6.18.37" if BR2_KERNEL_HEADERS_6_18 + default "7.1.2" if BR2_KERNEL_HEADERS_7_1 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 \