diff options
| author | Qiuwen Lu <[email protected]> | 2019-06-13 20:25:16 +0800 |
|---|---|---|
| committer | Qiuwen Lu <[email protected]> | 2019-06-13 20:25:16 +0800 |
| commit | 4e79871b6477d4c62db8c20e4ccaed729b040469 (patch) | |
| tree | d870551976f8a19ff7311bcf47c305a9db8ed641 | |
| parent | 8af98eecca48a90b405c13949318b3f2c9d1a025 (diff) | |
修正多个内核模块存在时只能打包一个内核模块的问题v4.3.8-20190614
| -rw-r--r-- | cmake/InstallDPDK.cmake | 9 | ||||
| -rw-r--r-- | tools/systemd/mrenv-script | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/cmake/InstallDPDK.cmake b/cmake/InstallDPDK.cmake index d327002..8922b87 100644 --- a/cmake/InstallDPDK.cmake +++ b/cmake/InstallDPDK.cmake @@ -10,11 +10,8 @@ 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 lib/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(DIRECTORY ${DPDK_LIBRARY_DIR}/modules/ + DESTINATION lib/modules/ COMPONENT Program) set(TOOLS_INSTALL_PATH bin) @@ -45,4 +42,4 @@ install(PROGRAMS ${DPDK_BINARY_TOOLS_PATH}/dpdk-pdump DESTINATION ${TOOLS_INSTAL RENAME mrtools-pdump COMPONENT Program) install(PROGRAMS ${DPDK_BINARY_TOOLS_PATH}/dpdk-procinfo DESTINATION ${TOOLS_INSTALL_PATH} - RENAME mrtools-pinfo COMPONENT Program)
\ No newline at end of file + RENAME mrtools-pinfo COMPONENT Program) diff --git a/tools/systemd/mrenv-script b/tools/systemd/mrenv-script index c462ada..1879c6c 100644 --- a/tools/systemd/mrenv-script +++ b/tools/systemd/mrenv-script @@ -29,7 +29,7 @@ if [ -z "$PCI_ADDR_IGB" ] && [ -z "$PCI_ADDR_IXGBE" ]; then NIC_BIND_AUTO=1 fi -MODULE_PATH=$MRZCPD_ROOT/lib/modules/$(uname -r)/extra/mrzcpd +MODULE_PATH=$MRZCPD_ROOT/lib/modules/$(uname -r)/extra/dpdk BIN_PATH=$MRZCPD_ROOT/bin/ KNI_MODULE=rte_kni UIO_MODULE=igb_uio @@ -421,4 +421,4 @@ case $action in exit 1 esac -exit $?
\ No newline at end of file +exit $? |