From fdc7283a05fa45c2a8fe7369ef741b61e26909e7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 24 May 2021 11:13:43 +0200 Subject: [PATCH] cmake: update 3.20.1 -> 3.20.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../cmake/{cmake-native_3.20.1.bb => cmake-native_3.20.2.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 2 +- ...CMakeDetermineSystem-use-oe-environment-vars-to-load.patch | 4 ++-- .../cmake/{cmake_3.20.1.bb => cmake_3.20.2.bb} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.20.1.bb => cmake-native_3.20.2.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.20.1.bb => cmake_3.20.2.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.20.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.20.2.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.20.1.bb rename to 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 \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0" +SRC_URI[sha256sum] = "aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e" UPSTREAM_CHECK_REGEX = "cmake-(?P\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 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 @@ -From ac9b8d316ff3e013bc9d3c063db99aa1f064ce6a Mon Sep 17 00:00:00 2001 +From e75f76b00cc9c1cfc231c5e731e975552f5dd13e Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Thu, 27 Apr 2017 11:35:05 -0400 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default @@ -25,7 +25,7 @@ Signed-off-by: Otavio Salvador 1 file changed, 7 insertions(+) diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake -index bae270d..5bb6bc0 100644 +index bae270de..5bb6bc0d 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -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 similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.20.1.bb rename to meta/recipes-devtools/cmake/cmake_3.20.2.bb -- 2.40.1