summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-09-02 23:13:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-03 09:44:30 +0100
commit1100c9a315a22a75517372e56faab1dccd021a4a (patch)
tree59ce1969f6b82d744f89fe1aa7a53a700269c8f7 /meta
parent416610659d4358c428ac449334ac7f80c34b7e70 (diff)
downloadpoky-1100c9a315a22a75517372e56faab1dccd021a4a.tar.gz
cmake: upgrade 3.18.1 -> 3.18.2
(From OE-Core rev: b8843d8781fc9312a5ff5551fc59b715b7e42b74) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.18.2.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.18.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.patch2
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.18.2.bb (renamed from meta/recipes-devtools/cmake/cmake_3.18.1.bb)0
4 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.18.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.18.2.bb
index d91e42ef9a..d91e42ef9a 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.18.1.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.18.2.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 94465efc85..1334977225 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -22,6 +22,6 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
22 file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ 22 file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
23" 23"
24 24
25SRC_URI[sha256sum] = "c0e3338bd37e67155b9d1e9526fec326b5c541f74857771b7ffed0c46ad62508" 25SRC_URI[sha256sum] = "5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e"
26 26
27UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 27UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
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 f3f9f7d8d1..c4f81b27b5 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 434761616f66074f1823b43145558c239c85b37d Mon Sep 17 00:00:00 2001 1From dd0fe8d54def4684d360b3e9b10e963ef0208202 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
diff --git a/meta/recipes-devtools/cmake/cmake_3.18.1.bb b/meta/recipes-devtools/cmake/cmake_3.18.2.bb
index 64c92b89f2..64c92b89f2 100644
--- a/meta/recipes-devtools/cmake/cmake_3.18.1.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.18.2.bb