cmake: sync nvml submodule to latest code.

[majianpeng]

Signed-off-by: Jianpeng Ma jianpeng.ma@intel.com

[tchaikov]

@majianpeng probably we can just use the sha1 of the upstream ? i.e. pmem/pmdk@cdca620 . what do you think? if you are good with it. i will force push it to ceph/nvml .

[majianpeng]

@tchaikov . If use this method, is it not need ceph/nvml?

[tchaikov]

@majianpeng i guess the point of using ceph/nvml is to ensure that we are able to stash not-yet-upstreamed fix in our fork. and yes. we can always point the GIT_REPOSITORY ceph/nvml in that case. i don't feel strong either way.

[majianpeng]

@tchaikov . sorry to late response. I'll modify by your suggestion.

[majianpeng]

@tchaikov . From the man git-clone. It only clone on a tag rather than a random commit. For the sha1 of the upstream ? i.e. pmem/pmdk@cdca620, it don't work. Can you give me a example? Thanks!

[tchaikov]

@majianpeng what i had in my mind was:

diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index 32a58e402e..b773e9329d 100644
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -123,7 +123,7 @@ if(WITH_PMEM)
   ExternalProject_Add(nvml_ext
     DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/src/
     GIT_REPOSITORY "https://github.com/ceph/nvml.git"
-    GIT_TAG "dd5b62dbc2cbbe048087dea"
+    GIT_TAG "cdca620c361714aef40f051"
     SOURCE_DIR ${CMAKE_BINARY_DIR}/src/nvml
     CONFIGURE_COMMAND ""
     BUILD_COMMAND $(MAKE)

after "git push -f" cdca620c361714aef40f051 to ceph/nvml.
but it seems neither do i have the write access to https://github.com/ceph/nvml.git . @liewegas could you grant me the write access to that repo as well?

[liewegas]

@tchaikov should work now?

[tchaikov]

@liewegas thanks. it works now.

@majianpeng could you update this PR? as https://github.com/ceph/nvml is sync'ed with its upstream now.

[tchaikov]

retest this please.

[majianpeng]

@tchaikov . sorry for later response. I still had a question: this can reduce sync ceph/nvml operation. etc, if pmdk HEAD tag is abcde. If the tag change to abcde. After this PR merged, ceph/nvml update to abcde. Or am i missing something? Hope your explain. Thanks very much!

[tchaikov]

if pmdk HEAD tag is abcde. If the tag change to abcde. After this PR merged, ceph/nvml update to abcde.

no. ceph/nvml is already sync'ed with upstream by me. that's why i asked for the write access from Sage. and yes, you can point the GIT_REPOSITORY directly to the upstream, and point it back to ceph/nvml if we want to include a change which is stashed in our fork, and it is not yet merged by upstream.