增加对Systemd（CentOS7）的自动化启动支持。

5 files changed, 23 insertions, 15 deletions

diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
index 63936fb..518c452 100644
--- a/conf/CMakeLists.txt
+++ b/conf/CMakeLists.txt
@@ -1,7 +1,10 @@
 

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

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

+configure_file(mrzcpd.ld.conf.in mrzcpd.conf)

+configure_file(mrzcpd.pc.in mrzcpd.pc)

+configure_file(mrzcpd.sysconfig.in mrzcpd)

 

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

-install(FILES mrglobal.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
+install(FILES mrglobal.conf DESTINATION ${MR_INSTALL_SYSCONFDIR} COMPONENT Profile)

+install(FILES ${CMAKE_BINARY_DIR}/conf/mrenv.conf DESTINATION ${MR_INSTALL_SYSCONFDIR} COMPONENT Profile)

+install(FILES ${CMAKE_BINARY_DIR}/conf/mrzcpd.conf DESTINATION ${MR_INSTALL_LDCONFDIR} COMPONENT Profile)

+install(FILES ${CMAKE_BINARY_DIR}/conf/mrzcpd.pc DESTINATION ${MR_INSTALL_LIBDIR}/pkgconfig COMPONENT Profile)

+install(FILES ${CMAKE_BINARY_DIR}/conf/mrzcpd DESTINATION ${MR_INSTALL_SYSUNITCONFDIR} COMPONENT Profile)
\ No newline at end of file
diff --git a/conf/dpdk-x86_64.conf.in b/conf/dpdk-x86_64.conf.in
deleted file mode 100644
index 668e228..0000000
--- a/conf/dpdk-x86_64.conf.in
+++ /dev/null
@@ -1,3 +0,0 @@
-@DPDK_ROOT_DIR@/lib

-@CMAKE_INSTALL_PREFIX@/lib

-@CMAKE_INSTALL_PREFIX@/lib64
\ No newline at end of file
diff --git a/conf/mrzcpd.ld.conf.in b/conf/mrzcpd.ld.conf.in
new file mode 100644
index 0000000..d5d8e56
--- /dev/null
+++ b/conf/mrzcpd.ld.conf.in
@@ -0,0 +1,2 @@
+# Marsio ZeroCopy Driver Library Path

+@MR_INSTALL_LIBDIR@
\ No newline at end of file
diff --git a/conf/mrzcpd.pc.in b/conf/mrzcpd.pc.in
new file mode 100644
index 0000000..2e7ae4a
--- /dev/null
+++ b/conf/mrzcpd.pc.in
@@ -0,0 +1,11 @@
+prefix=@MR_INSTALL_PREFIX@

+exec_prefix=@MR_INSTALL_PREFIX@

+libdir=@MR_INSTALL_LIBDIR@

+includedir=@MR_INSTALL_INCLUDEDIR@

+bindir=@MR_INSTALL_BINDIR@

+

+Name: mrzcpd

+Description: IIE-MESA Marsio ZeroCopy Driver

+Version: @MARSIO_VERSION@

+Libs: -L@MR_INSTALL_LIBDIR@ -lmarsio

+Cflags: -I@MR_INSTALL_INCLUDEDIR@
\ No newline at end of file
diff --git a/conf/mrenv.conf.in b/conf/mrzcpd.sysconfig.in
index 5755a15..206cd2b 100644
--- a/conf/mrenv.conf.in
+++ b/conf/mrzcpd.sysconfig.in
@@ -1,10 +1,5 @@
-# Configure File in Shell Format
-#
-# DPDK Envourment PATH
-
-DPDK_ROOT=@DPDK_ROOT_DIR@
-MARSIO_ROOT=@CMAKE_INSTALL_PREFIX@
-
+# Marsio ZeroCopy Install Path
+MRZCPD_ROOT=@CMAKE_INSTALL_PREFIX@
 # HUGEPAGES Count
 HUGEPAGE_NUM_2M=20000
 # PCI Resource Address using IXGBE_UIO drivers