From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Fri, 29 Jan 2021 02:05:53 +0000 (+0800)
Subject: cmake: bump to PMDK v1.10
X-Git-Tag: v16.2.7~50^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b9dbf4ecfcd250dae895f9b0d1f2bf43b9d2c7b0;p=ceph.git

cmake: bump to PMDK v1.10

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
Signed-off-by: Yin Congmin <congmin.yin@intel.com>
(cherry picked from commit 636ab08f2604efd4cac3200d5741fa15b070f072)
---

diff --git a/cmake/modules/Buildpmem.cmake b/cmake/modules/Buildpmem.cmake
index b147db43c945..ead5c80ae90f 100644
--- a/cmake/modules/Buildpmem.cmake
+++ b/cmake/modules/Buildpmem.cmake
@@ -9,7 +9,7 @@ function(build_pmem)
     set(source_dir_args
       SOURCE_DIR ${CMAKE_BINARY_DIR}/src/pmdk
       GIT_REPOSITORY https://github.com/ceph/pmdk.git
-      GIT_TAG "1.7"
+      GIT_TAG "1.10"
       GIT_SHALLOW TRUE
       GIT_CONFIG advice.detachedHead=false)
   endif()
diff --git a/make-dist b/make-dist
index bab3194544ec..75528c1b8608 100755
--- a/make-dist
+++ b/make-dist
@@ -186,8 +186,8 @@ download_boost $boost_version 4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8
 download_liburing 0.7 8e2842cfe947f3a443af301bdd6d034455536c38a455c7a700d0c1ad165a7543 \
                   https://github.com/axboe/liburing/archive \
                   https://git.kernel.dk/cgit/liburing/snapshot
-pmdk_version=1.7
-download_pmdk $pmdk_version 865ce1b422bc83109cb4a63dcff8fd1077eea3617e668faf6a043208d8be03ca \
+pmdk_version=1.10
+download_pmdk $pmdk_version 08dafcf94db5ac13fac9139c92225d9aa5f3724ea74beee4e6ca19a01a2eb20c \
                https://github.com/pmem/pmdk/releases/download/$pmdk_version
 build_dashboard_frontend
 generate_rook_ceph_client
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b6fa63366778..cc53f9a725cd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -526,6 +526,7 @@ if(WITH_BLUESTORE_PMEM OR WITH_RBD_RWL)
     if(WITH_RBD_RWL)
       find_package(pmem REQUIRED COMPONENTS pmemobj)
     endif()
+    find_package(pmem 1.10 REQUIRED COMPONENTS ${pmem_COMPONENTS})
   else()
     include(Buildpmem)
     build_pmem()