diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/recipes-devtools/cmake | |
parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz |
Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-devtools/cmake')
-rw-r--r-- | poky/meta/recipes-devtools/cmake/cmake-native_3.18.4.bb (renamed from poky/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/cmake/cmake.inc | 5 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch | 6 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch | 26 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch | 22 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/cmake/cmake_3.18.4.bb (renamed from poky/meta/recipes-devtools/cmake/cmake_3.19.2.bb) | 0 |
6 files changed, 16 insertions, 43 deletions
diff --git a/poky/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb b/poky/meta/recipes-devtools/cmake/cmake-native_3.18.4.bb index d91e42ef9..d91e42ef9 100644 --- a/poky/meta/recipes-devtools/cmake/cmake-native_3.19.2.bb +++ b/poky/meta/recipes-devtools/cmake/cmake-native_3.18.4.bb diff --git a/poky/meta/recipes-devtools/cmake/cmake.inc b/poky/meta/recipes-devtools/cmake/cmake.inc index db03819b6..e840e884c 100644 --- a/poky/meta/recipes-devtools/cmake/cmake.inc +++ b/poky/meta/recipes-devtools/cmake/cmake.inc @@ -11,7 +11,7 @@ BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://Copyright.txt;md5=c721f56fce89ba2eadc2fdd8ba1f4d83 \ - file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ + file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14 \ " CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" @@ -20,10 +20,9 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0002-cmake-Prevent-the-detection-of-Qt5.patch \ file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ - file://0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch \ " -SRC_URI[sha256sum] = "e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0" +SRC_URI[sha256sum] = "597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch b/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch index 818151032..c4f81b27b 100644 --- a/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch +++ b/poky/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch @@ -1,4 +1,4 @@ -From 66d5b27dc37ef6243f6549e16d0285ba6c064a6e Mon Sep 17 00:00:00 2001 +From dd0fe8d54def4684d360b3e9b10e963ef0208202 Mon Sep 17 00:00:00 2001 From: Cody P Schafer <dev@codyps.com> Date: Thu, 27 Apr 2017 11:35:05 -0400 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default @@ -25,10 +25,10 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 1 file changed, 7 insertions(+) diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake -index bae270d..5bb6bc0 100644 +index f3ec4da..bb05656 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake -@@ -111,6 +111,13 @@ else() +@@ -81,6 +81,13 @@ else() endif() endif() diff --git a/poky/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch b/poky/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch deleted file mode 100644 index 4483bbce1..000000000 --- a/poky/meta/recipes-devtools/cmake/cmake/0001-cm_cxx_features.cmake-do-not-try-to-run-the-test-bin.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ca105727dc4862733c3aad09e9de819be63a7b6b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Sun, 27 Dec 2020 23:18:10 +0100 -Subject: [PATCH] cm_cxx_features.cmake: do not try to run the test binary - -This causes errors when cross compiling cmake. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - Source/Checks/cm_cxx_features.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake -index 663d89a..e8dca3b 100644 ---- a/Source/Checks/cm_cxx_features.cmake -+++ b/Source/Checks/cm_cxx_features.cmake -@@ -81,7 +81,7 @@ if(CMake_HAVE_CXX_MAKE_UNIQUE) - endif() - cm_check_cxx_feature(unique_ptr) - if (NOT CMAKE_CXX_STANDARD LESS "17") -- cm_check_cxx_feature(filesystem TRY_RUN) -+ cm_check_cxx_feature(filesystem) - else() - set(CMake_HAVE_CXX_FILESYSTEM FALSE) - endif() diff --git a/poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch b/poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch index 33db07ccf..162bfe578 100644 --- a/poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch +++ b/poky/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch @@ -1,4 +1,4 @@ -From 98abade8cc119e076e4c5f1461c5188f6d49c1d8 Mon Sep 17 00:00:00 2001 +From 106cf5134d22db889e4ddf2f98ec302d5f4b9ca7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador <otavio@ossystems.com.br> Date: Wed, 17 Jan 2018 10:02:14 -0200 Subject: [PATCH] cmake: Prevent the detection of Qt5 @@ -25,23 +25,23 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt -index 452a303..d0a9fb4 100644 +index 98dd0e2..252302b 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -3,7 +3,7 @@ project(QtDialog) CMake_OPTIONAL_COMPONENT(cmake-gui) --find_package(Qt5Widgets REQUIRED) -+#find_package(Qt5Widgets REQUIRED) - - set(CMake_QT_EXTRA_LIBRARIES) - +-find_package(Qt5Widgets QUIET) ++#find_package(Qt5Widgets QUIET) + if (Qt5Widgets_FOUND) + include_directories(${Qt5Widgets_INCLUDE_DIRS}) + add_definitions(${Qt5Widgets_DEFINITONS}) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt -index 1fb47cb..e022229 100644 +index db6dbf3..5b26879 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt -@@ -251,7 +251,7 @@ if(BUILD_TESTING) +@@ -215,7 +215,7 @@ if(BUILD_TESTING) set(CMake_TEST_Qt5 1) endif() if(CMake_TEST_Qt5) @@ -96,10 +96,10 @@ index c08efc4..87e25d9 100644 set(CMAKE_CXX_STANDARD 11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin) diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt -index 370dd76..6bacbff 100644 +index 10e66c3..ecc4eeb 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt -@@ -473,7 +473,7 @@ if(NOT WIN32) +@@ -440,7 +440,7 @@ if(NOT WIN32) endif () find_package(Qt4 QUIET) diff --git a/poky/meta/recipes-devtools/cmake/cmake_3.19.2.bb b/poky/meta/recipes-devtools/cmake/cmake_3.18.4.bb index 64c92b89f..64c92b89f 100644 --- a/poky/meta/recipes-devtools/cmake/cmake_3.19.2.bb +++ b/poky/meta/recipes-devtools/cmake/cmake_3.18.4.bb |