summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2024-08-22 11:34:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-08-23 09:12:37 +0100
commit9561a1d51e3a2cf183435eae03202dc9b581fbfd (patch)
tree36a441d35b2d7bdfe8fd9806e748294c321ae3ff
parent19fb6a61535793aaac90163e5a44b5cea33d57e8 (diff)
downloadpoky-9561a1d51e3a2cf183435eae03202dc9b581fbfd.tar.gz
cmake: upgrade 3.30.1 -> 3.30.2
(From OE-Core rev: 5b26b17b1a5c9952e5b4adb9772092323bdddad3) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.30.2.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.30.1.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc2
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch7
-rw-r--r--meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch2
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.30.2.bb (renamed from meta/recipes-devtools/cmake/cmake_3.30.1.bb)0
5 files changed, 4 insertions, 7 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.30.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.30.2.bb
index ddc41f289e..ddc41f289e 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.30.1.bb
+++ b/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 604a22a2f0..b88a4e4bc6 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])}"
19SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ 19SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
20" 20"
21 21
22SRC_URI[sha256sum] = "df9b3c53e3ce84c3c1b7c253e5ceff7d8d1f084ff0673d048f260e04ccb346e1" 22SRC_URI[sha256sum] = "46074c781eccebc433e98f0bbfa265ca3fd4381f245ca3b140e7711531d60db2"
23 23
24UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 24UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
25 25
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 090f441f0f..7dc07582da 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 @@
1From a2cd906c36a04c8ce5a0095ae53892902b30d728 Mon Sep 17 00:00:00 2001 1From 5e624d82c2838fec2f41ebec124f74aacff9e61f Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Wed, 28 Dec 2022 17:51:27 +0800 3Date: Wed, 28 Dec 2022 17:51:27 +0800
4Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 4Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2
@@ -22,7 +22,7 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
22 1 file changed, 1 insertion(+), 1 deletion(-) 22 1 file changed, 1 insertion(+), 1 deletion(-)
23 23
24diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt 24diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
25index b766aee425..34ae7d2a39 100644 25index b766aee4..34ae7d2a 100644
26--- a/Utilities/cmcurl/CMakeLists.txt 26--- a/Utilities/cmcurl/CMakeLists.txt
27+++ b/Utilities/cmcurl/CMakeLists.txt 27+++ b/Utilities/cmcurl/CMakeLists.txt
28@@ -94,7 +94,7 @@ set(USE_ECH OFF) 28@@ -94,7 +94,7 @@ set(USE_ECH OFF)
@@ -34,6 +34,3 @@ index b766aee425..34ae7d2a39 100644
34 set(USE_NGTCP2 OFF) 34 set(USE_NGTCP2 OFF)
35 set(USE_OPENSSL_QUIC OFF) 35 set(USE_OPENSSL_QUIC OFF)
36 set(USE_QUICHE OFF) 36 set(USE_QUICHE OFF)
37--
382.39.2
39
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 af164084d0..8788cc7964 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 @@
1From 2d3f6933f78d393514a48f8222ac8c3c39cb5fc7 Mon Sep 17 00:00:00 2001 1From b97f7dbb2637c6da772833c93bedc8be77520fb9 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 5 Jul 2018 10:28:04 -0300 3Date: Thu, 5 Jul 2018 10:28:04 -0300
4Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal 4Subject: [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
index 9146fa8c0f..9146fa8c0f 100644
--- a/meta/recipes-devtools/cmake/cmake_3.30.1.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.30.2.bb