适配DPDK17.02。DPDK17.02中网卡绑定工具路径发生变更。

1 files changed, 38 insertions, 34 deletions

diff --git a/cmake/InstallDPDK.cmake b/cmake/InstallDPDK.cmake
index 1f40d7c..5a193ab 100644
--- a/cmake/InstallDPDK.cmake
+++ b/cmake/InstallDPDK.cmake
@@ -1,34 +1,38 @@
-

-# Install DPDK Library, Modules, Scripts etc.

-# to MR_INSTALL

-

-# find dpdk location

-find_package(DPDK REQUIRED)

-

-# locate and install kernel module

-exec_program(uname ARGS -r OUTPUT_VARIABLE KERNEL_VERSION)

-set(KMOD_FROM_PATH ${DPDK_LIBRARY_DIR}/modules/${KERNEL_VERSION}/extra/dpdk)

-set(KMOD_INSTALL_PATH ${MR_INSTALL_LIBDIR}/modules/${KERNEL_VERSION}/extra/mrzcpd)

-

-install(FILES ${KMOD_FROM_PATH}/rte_kni.ko

-		DESTINATION ${KMOD_INSTALL_PATH} COMPONENT Program)

-

-install(FILES ${KMOD_FROM_PATH}/igb_uio.ko

-		DESTINATION ${KMOD_INSTALL_PATH} COMPONENT Program)

-

-# install tools

-set(TOOLS_FROM_PATH ${DPDK_ROOT_DIR}/share/dpdk/tools/)

-set(TOOLS_INSTALL_PATH ${MR_INSTALL_BINDIR})

-set(TOOLS_NAME dpdk-devbind.py)

-

-if(EXISTS ${TOOLS_FROM_PATH}/dpdk_nic_bind.py)

-	set(TOOLS_NAME dpdk_nic_bind.py)

-endif()

-

-if(EXISTS ${TOOLS_FROM_PATH}/dpdk-devbind.py)

-	set(TOOLS_NAME dpdk-devbind.py)

-endif()

-

-install(FILES ${TOOLS_FROM_PATH}/${TOOLS_NAME}

-		DESTINATION ${TOOLS_INSTALL_PATH}

-		RENAME mr_nic_bind PERMISSIONS WORLD_EXECUTE COMPONENT Program)
\ No newline at end of file
+
+# Install DPDK Library, Modules, Scripts etc.
+# to MR_INSTALL
+
+# find dpdk location
+find_package(DPDK REQUIRED)
+
+# locate and install kernel module
+exec_program(uname ARGS -r OUTPUT_VARIABLE KERNEL_VERSION)
+set(KMOD_FROM_PATH ${DPDK_LIBRARY_DIR}/modules/${KERNEL_VERSION}/extra/dpdk)
+set(KMOD_INSTALL_PATH ${MR_INSTALL_LIBDIR}/modules/${KERNEL_VERSION}/extra/mrzcpd)
+
+install(FILES ${KMOD_FROM_PATH}/rte_kni.ko
+		DESTINATION ${KMOD_INSTALL_PATH} COMPONENT Program)
+
+install(FILES ${KMOD_FROM_PATH}/igb_uio.ko
+		DESTINATION ${KMOD_INSTALL_PATH} COMPONENT Program)
+
+set(TOOLS_INSTALL_PATH ${MR_INSTALL_BINDIR})
+
+if(EXISTS ${DPDK_ROOT_DIR}/share/dpdk/tools/dpdk_nic_bind.py)
+    set(MR_BIND_TOOLS_FROM ${DPDK_ROOT_DIR}/share/dpdk/tools/dpdk_nic_bind.py)
+endif()
+
+if(EXISTS ${DPDK_ROOT_DIR}/share/dpdk/tools/dpdk-devbind.py)
+	set(MR_BIND_TOOLS_FROM ${DPDK_ROOT_DIR}/share/dpdk/tools/dpdk-devbind.py)
+endif()
+
+if(EXISTS ${DPDK_ROOT_DIR}/share/dpdk/usertools/dpdk_nic_bind.py)
+    set(MR_BIND_TOOLS_FROM ${DPDK_ROOT_DIR}/share/dpdk/usertools/dpdk_nic_bind.py)
+endif()
+
+if(EXISTS ${DPDK_ROOT_DIR}/share/dpdk/usertools/dpdk-devbind.py)
+	set(MR_BIND_TOOLS_FROM ${DPDK_ROOT_DIR}/share/dpdk/usertools/dpdk-devbind.py)
+endif()
+
+install(PROGRAMS ${MR_BIND_TOOLS_FROM} DESTINATION ${TOOLS_INSTALL_PATH}
+        RENAME mr_nic_bind COMPONENT Program)
\ No newline at end of file