meta-starlingx: remove the upstream layer

[pti/rtp.git] / meta-starlingx / meta-stx-virt / recipes-extended / ceph / ceph-13.2.2 / 0001-Correct-the-path-to-find-version.h-in-rocksdb.patch

diff --git a/meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-13.2.2/0001-Correct-the-path-to-find-version.h-in-rocksdb.patch b/meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-13.2.2/0001-Correct-the-path-to-find-version.h-in-rocksdb.patch
deleted file mode 100644 (file)
index 788505b..0000000
--- a/meta-starlingx/meta-stx-virt/recipes-extended/ceph/ceph-13.2.2/0001-Correct-the-path-to-find-version.h-in-rocksdb.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a53605694d5301b7bb543464b17f74bbbd35d372 Mon Sep 17 00:00:00 2001
-From: Dengke Du <dengke.du@windriver.com>
-Date: Tue, 28 Aug 2018 10:04:40 +0800
-Subject: [PATCH] Correct the path to find version.h in rocksdb
-
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
----
- cmake/modules/Findrocksdb.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/modules/Findrocksdb.cmake b/cmake/modules/Findrocksdb.cmake
-index f8369f7..36b67ea 100644
---- a/cmake/modules/Findrocksdb.cmake
-+++ b/cmake/modules/Findrocksdb.cmake
-@@ -9,17 +9,17 @@
- #  ROCKSDB_VERSION_MINOR
- #  ROCKSDB_VERSION_PATCH
- 
--find_path(ROCKSDB_INCLUDE_DIR rocksdb/db.h)
-+find_path(ROCKSDB_INCLUDE_DIR rocksdb/db.h ${CMAKE_SYSROOT})
- 
--find_library(ROCKSDB_LIBRARIES rocksdb)
-+find_library(ROCKSDB_LIBRARIES rocksdb ${CMAKE_SYSROOT})
- 
- if(ROCKSDB_INCLUDE_DIR AND EXISTS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h")
-   foreach(ver "MAJOR" "MINOR" "PATCH")
--    file(STRINGS "${ROCKSDB_INCLUDE_DIR}/version.h" ROCKSDB_VER_${ver}_LINE
-+    file(STRINGS "${ROCKSDB_INCLUDE_DIR}/rocksdb/version.h" ROCKSDB_VER_${ver}_LINE
-       REGEX "^#define[ \t]+ROCKSDB_${ver}[ \t]+[0-9]+$")
-     string(REGEX REPLACE "^#define[ \t]+ROCKSDB_${ver}[ \t]+([0-9]+)$"
--      "\\1" ROCKSDB_VERSION_${ver} "${ROCKDB_VER_${ver}_LINE}")
--    unset(${ROCKDB_VER_${ver}_LINE})
-+      "\\1" ROCKSDB_VERSION_${ver} "${ROCKSDB_VER_${ver}_LINE}")
-+    unset(ROCKSDB_VER_${ver}_LINE)
-   endforeach()
-   set(ROCKSDB_VERSION_STRING
-     "${ROCKSDB_VERSION_MAJOR}.${ROCKSDB_VERSION_MINOR}.${ROCKSDB_VERSION_PATCH}")
--- 
-2.7.4
-