From 5b26b17b1a5c9952e5b4adb9772092323bdddad3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 22 Aug 2024 11:34:55 +0200 Subject: [PATCH] cmake: upgrade 3.30.1 -> 3.30.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../{cmake-native_3.30.1.bb => cmake-native_3.30.2.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 2 +- .../cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch | 7 ++----- ...able-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | 2 +- .../cmake/{cmake_3.30.1.bb => cmake_3.30.2.bb} | 0 5 files changed, 4 insertions(+), 7 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.30.1.bb => cmake-native_3.30.2.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.30.1.bb => cmake_3.30.2.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.30.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.30.2.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.30.1.bb rename to meta/recipes-devtools/cmake/cmake-native_3.30.2.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 604a22a2f0a..b88a4e4bc6f 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "df9b3c53e3ce84c3c1b7c253e5ceff7d8d1f084ff0673d048f260e04ccb346e1" +SRC_URI[sha256sum] = "46074c781eccebc433e98f0bbfa265ca3fd4381f245ca3b140e7711531d60db2" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch index 090f441f0fe..7dc07582da0 100644 --- a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch +++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch @@ -1,4 +1,4 @@ -From a2cd906c36a04c8ce5a0095ae53892902b30d728 Mon Sep 17 00:00:00 2001 +From 5e624d82c2838fec2f41ebec124f74aacff9e61f Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Wed, 28 Dec 2022 17:51:27 +0800 Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 @@ -22,7 +22,7 @@ Signed-off-by: Trevor Gamblin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt -index b766aee425..34ae7d2a39 100644 +index b766aee4..34ae7d2a 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -94,7 +94,7 @@ set(USE_ECH OFF) @@ -34,6 +34,3 @@ index b766aee425..34ae7d2a39 100644 set(USE_NGTCP2 OFF) set(USE_OPENSSL_QUIC OFF) set(USE_QUICHE OFF) --- -2.39.2 - diff --git a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch index af164084d03..8788cc7964e 100644 --- a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch +++ b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch @@ -1,4 +1,4 @@ -From 2d3f6933f78d393514a48f8222ac8c3c39cb5fc7 Mon Sep 17 00:00:00 2001 +From b97f7dbb2637c6da772833c93bedc8be77520fb9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 5 Jul 2018 10:28:04 -0300 Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal diff --git a/meta/recipes-devtools/cmake/cmake_3.30.1.bb b/meta/recipes-devtools/cmake/cmake_3.30.2.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.30.1.bb rename to meta/recipes-devtools/cmake/cmake_3.30.2.bb -- 2.47.2