summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-05-24 11:13:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-25 22:36:09 +0100
commit0c06a3b65d38ca8b06187d3392e4e48b7ac4f8fc (patch)
tree9b0ab4a8ec78b52804da082c4db8ba17a1bfc35b
parentd44269179a30b3b29f042dba5e7908323f6b88e4 (diff)
downloadpoky-0c06a3b65d38ca8b06187d3392e4e48b7ac4f8fc.tar.gz
cmake: update 3.20.1 -> 3.20.2
(From OE-Core rev: fdc7283a05fa45c2a8fe7369ef741b61e26909e7) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.20.2.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.20.1.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc2
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch4
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.20.2.bb (renamed from meta/recipes-devtools/cmake/cmake_3.20.1.bb)0
4 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.20.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.20.2.bb
index d91e42ef9a..d91e42ef9a 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.20.1.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.20.2.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 2e6059f980..be43760628 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
21 file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ 21 file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
22" 22"
23 23
24SRC_URI[sha256sum] = "3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0" 24SRC_URI[sha256sum] = "aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e"
25 25
26UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 26UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
27 27
diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
index 06e10bf861..9609f5f7c2 100644
--- a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
+++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
@@ -1,4 +1,4 @@
1From ac9b8d316ff3e013bc9d3c063db99aa1f064ce6a Mon Sep 17 00:00:00 2001 1From e75f76b00cc9c1cfc231c5e731e975552f5dd13e Mon Sep 17 00:00:00 2001
2From: Cody P Schafer <dev@codyps.com> 2From: Cody P Schafer <dev@codyps.com>
3Date: Thu, 27 Apr 2017 11:35:05 -0400 3Date: Thu, 27 Apr 2017 11:35:05 -0400
4Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default 4Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default
@@ -25,7 +25,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
25 1 file changed, 7 insertions(+) 25 1 file changed, 7 insertions(+)
26 26
27diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake 27diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
28index bae270d..5bb6bc0 100644 28index bae270de..5bb6bc0d 100644
29--- a/Modules/CMakeDetermineSystem.cmake 29--- a/Modules/CMakeDetermineSystem.cmake
30+++ b/Modules/CMakeDetermineSystem.cmake 30+++ b/Modules/CMakeDetermineSystem.cmake
31@@ -111,6 +111,13 @@ else() 31@@ -111,6 +111,13 @@ else()
diff --git a/meta/recipes-devtools/cmake/cmake_3.20.1.bb b/meta/recipes-devtools/cmake/cmake_3.20.2.bb
index 64c92b89f2..64c92b89f2 100644
--- a/meta/recipes-devtools/cmake/cmake_3.20.1.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.20.2.bb