From e46695bbe4ab583f39f9448f3ef3e044efa28808 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 23 Nov 2025 18:07:20 +0100 Subject: [PATCH] package/cmake: bump version to 4.2.0 Release notes: https://cmake.org/cmake/help/latest/release/4.2.html https://cmake.org/cmake/help/latest/release/4.1.html License file was renamed upstream https://gitlab.kitware.com/cmake/cmake/-/commit/2d42a5444f859891b6598c76ea5d51510013565e and updated: https://gitlab.kitware.com/cmake/cmake/-/commits/v4.0.3/LICENSE.rst?ref_type=tags Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- package/cmake/Config.in.host | 15 +++++++++++++++ package/cmake/cmake.hash | 6 +++--- package/cmake/cmake.mk | 6 +++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/package/cmake/Config.in.host b/package/cmake/Config.in.host index b30ce03a1c..86f93b0ac8 100644 --- a/package/cmake/Config.in.host +++ b/package/cmake/Config.in.host @@ -63,10 +63,25 @@ config BR2_HOST_CMAKE_AT_LEAST_3_31 bool select BR2_HOST_CMAKE_AT_LEAST_3_30 +config BR2_HOST_CMAKE_AT_LEAST_4_0 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_31 + +config BR2_HOST_CMAKE_AT_LEAST_4_1 + bool + select BR2_HOST_CMAKE_AT_LEAST_4_0 + +config BR2_HOST_CMAKE_AT_LEAST_4_2 + bool + select BR2_HOST_CMAKE_AT_LEAST_4_1 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_HOST_CMAKE_AT_LEAST string + default "4.2" if BR2_HOST_CMAKE_AT_LEAST_4_2 + default "4.1" if BR2_HOST_CMAKE_AT_LEAST_4_1 + default "4.0" if BR2_HOST_CMAKE_AT_LEAST_4_0 default "3.31" if BR2_HOST_CMAKE_AT_LEAST_3_31 default "3.30" if BR2_HOST_CMAKE_AT_LEAST_3_30 default "3.29" if BR2_HOST_CMAKE_AT_LEAST_3_29 diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index cbca2fc355..2bc7b740d2 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.31/cmake-3.31.9-SHA-256.txt -sha256 5d4fdec04247ca8a8e8f63692f0d0f1e9d6d082a2bdd008dff8ab3ba7215aa83 cmake-3.31.9.tar.gz +# From https://cmake.org/files/v4.2/cmake-4.2.0-SHA-256.txt +sha256 4104e94657d247c811cb29985405a360b78130b5d51e7f6daceb2447830bd579 cmake-4.2.0.tar.gz # Locally calculated -sha256 0676e30827684487aa0ea8f72f01e9460a6320fa34a2888df0ad1dd3e8a06eb8 Copyright.txt +sha256 1e0d48f16c60f400838a96989684ae12cec35cb96688db11e8cb0204058cf4b8 LICENSE.rst diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 8f3a54be5a..66b169440c 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -5,11 +5,11 @@ ################################################################################ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y -CMAKE_VERSION_MAJOR = 3.31 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 +CMAKE_VERSION_MAJOR = 4.2 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause -CMAKE_LICENSE_FILES = Copyright.txt +CMAKE_LICENSE_FILES = LICENSE.rst CMAKE_CPE_ID_VALID = YES # Tool download MITM attack warning if using npm package to install cmake CMAKE_IGNORE_CVES = CVE-2016-10642