修改CMakeLists文件，适应新版的Service启动文件。v3.1.7-20160614

3 files changed, 13 insertions, 19 deletions

diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
index 2053f8b..8ab666b 100644
--- a/conf/CMakeLists.txt
+++ b/conf/CMakeLists.txt
@@ -1,8 +1,7 @@
 

 configure_file(dpdk-x86_64.conf.in ${CMAKE_SOURCE_DIR}/conf/dpdk-x86_64.conf)

-configure_file(ixgbe.conf.in ${CMAKE_SOURCE_DIR}/conf/ixgbe.conf)

+configure_file(mrenv.conf.in ${CMAKE_SOURCE_DIR}/conf/mrenv.conf)

 

-install(FILES ixgbe.conf DESTINATION /etc/ COMPONENT Profile)

-install(FILES mlx4.conf DESTINATION /etc/ COMPONENT Profile)

+install(FILES mrenv.conf DESTINATION /etc/ COMPONENT Profile)

 install(FILES nl2fwd.conf DESTINATION /etc/ COMPONENT Profile)

 install(FILES dpdk-x86_64.conf DESTINATION /etc/ld.so.conf.d/ COMPONENT Profile)
\ No newline at end of file
diff --git a/conf/ixgbe.conf.in b/conf/ixgbe.conf.in
deleted file mode 100644
index fdd4c9a..0000000
--- a/conf/ixgbe.conf.in
+++ /dev/null
@@ -1,16 +0,0 @@
-# Configure File in Shell Format
-# To configure mlx4 uio network drivers and dpdk env
-#
-# DPDK Envourment PATH
-
-DPDK_ROOT=@DPDK_ROOT_DIR@
-
-# HUGEPAGES Count
-HUGEPAGE_MEM=20000
-
-# PCI Resource Address using IXGBE_UIO drivers
-IXGBE_UIO=0000:06:00.0,0000:06:00.1,0000:0a:00.0,0000:0a:00.1
-
-# Do not modified !
-DPDK_MODULES_DIR=$DPDK_ROOT/lib/modules/$(uname -r)/extra/dpdk
-DPDK_TOOLS_DIR=$DPDK_ROOT/sbin
\ No newline at end of file
diff --git a/conf/mrenv.conf.in b/conf/mrenv.conf.in
new file mode 100644
index 0000000..5755a15
--- /dev/null
+++ b/conf/mrenv.conf.in
@@ -0,0 +1,11 @@
+# Configure File in Shell Format
+#
+# DPDK Envourment PATH
+
+DPDK_ROOT=@DPDK_ROOT_DIR@
+MARSIO_ROOT=@CMAKE_INSTALL_PREFIX@
+
+# HUGEPAGES Count
+HUGEPAGE_NUM_2M=20000
+# PCI Resource Address using IXGBE_UIO drivers
+PCI_ADDR_IXGBE=0000:06:00.0,0000:06:00.1,0000:0a:00.0,0000:0a:00.1
\ No newline at end of file