From: chunmei <chunmei.liu@intel.com>
Date: Wed, 4 Oct 2017 18:25:15 +0000 (-0700)
Subject:     fix dpdk build error.
X-Git-Tag: v13.0.1~673^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bad11933754fbb2a8b698a0e899b77d354816549;p=ceph-ci.git

fix dpdk build error.
    when ./do_cmake.sh add  -DWITH_DPDK=ON -DUSE_CRYPTOPP=ON -DWITH_NSS=OFF -DWITH_TESTS=OFF
    if build debian package, need remove some file froms install since we disabled TESTS.

    Signed-off-by: chunmei <chunmei.liu@intel.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e48afcff51d..15021fab9af 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -654,6 +654,9 @@ set(ceph_common_deps
 if(HAVE_RDMA)
   list(APPEND ceph_common_deps ${RDMA_LIBRARY})
 endif()
+if(HAVE_DPDK)
+  list(APPEND ceph_common_deps ${DPDK_LIBRARIES})
+endif()
 if(NOT WITH_SYSTEM_BOOST)
   list(APPEND ceph_common_deps ${ZLIB_LIBRARIES})
 endif()
diff --git a/src/msg/async/dpdk/DPDKStack.cc b/src/msg/async/dpdk/DPDKStack.cc
index e828789a51d..fce05098007 100644
--- a/src/msg/async/dpdk/DPDKStack.cc
+++ b/src/msg/async/dpdk/DPDKStack.cc
@@ -48,6 +48,7 @@
 
 #include "common/dout.h"
 #include "include/assert.h"
+#include "common/Cond.h"
 
 #define dout_subsys ceph_subsys_dpdk
 #undef dout_prefix
diff --git a/src/msg/async/dpdk/TCP.h b/src/msg/async/dpdk/TCP.h
index a601130c335..3eab5a5b9b9 100644
--- a/src/msg/async/dpdk/TCP.h
+++ b/src/msg/async/dpdk/TCP.h
@@ -383,7 +383,7 @@ class tcp {
       uint32_t key[16];
       isn_secret () {
         for (auto& k : key) {
-          k = ceph::util::generate_random_number<uint32_t>();
+          k = ceph::util::generate_random_number<uint32_t>(0, std::numeric_limits<uint32_t>::max());
         }
       }
     };