🐎 ci(DPISDN-9): 添加多平台rpm打包流程

添加多平台rpm打包流程

7 files changed, 24 insertions, 24 deletions

diff --git a/tools/systemd/CMakeLists.txt b/tools/systemd/CMakeLists.txt
index 2cb6de4..9ecee55 100644
--- a/tools/systemd/CMakeLists.txt
+++ b/tools/systemd/CMakeLists.txt
@@ -1,25 +1,25 @@
-configure_file(mrzcpd-hwdb-setup.service.in mrzcpd-hwdb-setup.service)
-configure_file(mrzcpd-hugepages-setup.service.in mrzcpd-hugepages-setup.service)
+configure_file(mrzcpd_hwdb_setup.service.in mrzcpd_hwdb_setup.service)
+configure_file(mrzcpd_hugepages_setup.service.in mrzcpd_hugepages_setup.service)
 configure_file(mrzcpd.service.in mrzcpd.service)
 configure_file(mrtunnat.service.in mrtunnat.service)
 configure_file(mrapm_device.service.in mrapm_device.service)
 configure_file(mrapm_stream.service.in mrapm_stream.service)
 
-install(FILES ${CMAKE_BINARY_DIR}/tools/systemd/mrzcpd-hwdb-setup.service
-        DESTINATION ${MR_INSTALL_SYSUNITDIR} COMPONENT Program)
+install(FILES ${CMAKE_BINARY_DIR}/tools/systemd/mrzcpd_hwdb_setup.service
+        DESTINATION ${MR_INSTALL_SYSTEM} COMPONENT Program)
 
-install(FILES ${CMAKE_BINARY_DIR}/tools/systemd/mrzcpd-hugepages-setup.service
-        DESTINATION ${MR_INSTALL_SYSUNITDIR} COMPONENT Program)
+install(FILES ${CMAKE_BINARY_DIR}/tools/systemd/mrzcpd_hugepages_setup.service
+        DESTINATION ${MR_INSTALL_SYSTEM} COMPONENT Program)
 
 install(FILES ${CMAKE_BINARY_DIR}/tools/systemd/mrzcpd.service
-        DESTINATION ${MR_INSTALL_SYSUNITDIR} COMPONENT Program)
+        DESTINATION ${MR_INSTALL_SYSTEM} COMPONENT Program)
 
 install(FILES ${CMAKE_BINARY_DIR}/tools/systemd/mrtunnat.service
-        DESTINATION ${MR_INSTALL_SYSUNITDIR} COMPONENT Program)
+        DESTINATION ${MR_INSTALL_SYSTEM} COMPONENT Program)
 
 install(FILES ${CMAKE_BINARY_DIR}/tools/systemd/mrapm_device.service
-        DESTINATION ${MR_INSTALL_SYSUNITDIR} COMPONENT Program)
+        DESTINATION ${MR_INSTALL_SYSTEM} COMPONENT Program)
 
 install(FILES ${CMAKE_BINARY_DIR}/tools/systemd/mrapm_stream.service
-        DESTINATION ${MR_INSTALL_SYSUNITDIR} COMPONENT Program)
+        DESTINATION ${MR_INSTALL_SYSTEM} COMPONENT Program)
 
diff --git a/tools/systemd/mrapm_device.service.in b/tools/systemd/mrapm_device.service.in
index e3e3a96..b3e998c 100644
--- a/tools/systemd/mrapm_device.service.in
+++ b/tools/systemd/mrapm_device.service.in
@@ -5,7 +5,7 @@ Requires=mrzcpd.service
 
 [Service]
 Type=simple
-ExecStart=@MR_INSTALL_BINDIR@/monit_device --prometheus-client
+ExecStart=@MR_INSTALL_PREFIX@/bin/monit_device --prometheus-client
 RestartSec=10s
 Restart=always
 PrivateTmp=True
diff --git a/tools/systemd/mrapm_stream.service.in b/tools/systemd/mrapm_stream.service.in
index 806ff9d..473c2a8 100644
--- a/tools/systemd/mrapm_stream.service.in
+++ b/tools/systemd/mrapm_stream.service.in
@@ -5,10 +5,10 @@ Requires=mrzcpd.service
 
 [Service]
 Type=simple
-ExecStart=@MR_INSTALL_BINDIR@/monit_stream --prometheus-client
+ExecStart=@CMAKE_INSTALL_PREFIX@/bin/monit_stream --prometheus-client
 RestartSec=10s
 Restart=always
 PrivateTmp=true
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/tools/systemd/mrtunnat.service.in b/tools/systemd/mrtunnat.service.in
index c0af476..d1a91b3 100644
--- a/tools/systemd/mrtunnat.service.in
+++ b/tools/systemd/mrtunnat.service.in
@@ -6,11 +6,11 @@ After=mrenv.service
 [Service]
 EnvironmentFile=/etc/sysconfig/mrzcpd
 ExecStartPre=/usr/bin/systemctl is-active mrzcpd
-ExecStart=@MR_INSTALL_BINDIR@/mrtunnat -c @MR_INSTALL_SYSCONFDIR@/mrtunnat.conf
+ExecStart=@CMAKE_INSTALL_PREFIX@/bin/mrtunnat -c @CMAKE_INSTALL_PREFIX@/etc/mrtunnat.conf
 Restart=always
 RestartSec=5s
 Type=notify
 LimitCORE=infinity
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/tools/systemd/mrzcpd.service.in b/tools/systemd/mrzcpd.service.in
index c840394..be4eac5 100644
--- a/tools/systemd/mrzcpd.service.in
+++ b/tools/systemd/mrzcpd.service.in
@@ -1,19 +1,19 @@
 [Unit]
 Description=Marsio ZeroCopy Driver Daemon
-Requires=mrzcpd-hugepages-setup.service mrzcpd-hwdb-setup.service k3s.service
-After=mrzcpd-hugepages-setup.service mrzcpd-hwdb-setup.service k3s.service
+Requires=mrzcpd_hugepages_setup.service mrzcpd_hwdb_setup.service k3s.service
+After=mrzcpd_hugepages_setup.service mrzcpd_hwdb_setup.service k3s.service
 
 [Service]
 Environment=SYSTEMD_LOG_LEVEL=debug
-Environment=MLX5_GLUE_PATH=@MR_INSTALL_LIBDIR@
+Environment=MLX5_GLUE_PATH=@MR_INSTALL_PREFIX@/lib
 EnvironmentFile=/etc/sysconfig/mrzcpd
-ExecStartPre=python3 @MR_INSTALL_BINDIR@/devbind.py bind
-ExecStart=@MR_INSTALL_BINDIR@/mrzcpd -c @MR_INSTALL_SYSCONFDIR@/mrglobal.conf
+ExecStartPre=python3 @MR_INSTALL_PREFIX@/bin/devbind.py bind
+ExecStart=@MR_INSTALL_PREFIX@/bin/mrzcpd -c @MR_INSTALL_PREFIX@/etc/mrglobal.conf
 ExecStopPost=/bin/bash -c 'rm -f /run/mrzcpd/huge_pages/rtemap_*'
 ExecStopPost=/usr/bin/rm -f /run/.rte_config
 ExecStopPost=/usr/bin/rm -f /run/.rte_hugepage_info
 ExecStopPost=/usr/bin/rm -rf /run/.dpdk
-ExecStopPost=python3 @MR_INSTALL_BINDIR@/devbind.py unbind
+ExecStopPost=python3 @MR_INSTALL_PREFIX@/bin/devbind.py unbind
 
 Restart=always
 RestartSec=5s
@@ -23,4 +23,4 @@ LimitCORE=infinity
 LimitNOFILE=524288
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/tools/systemd/mrzcpd-hugepages-setup.service.in b/tools/systemd/mrzcpd_hugepages_setup.service.in
index 2973a09..21e2156 100644
--- a/tools/systemd/mrzcpd-hugepages-setup.service.in
+++ b/tools/systemd/mrzcpd_hugepages_setup.service.in
@@ -4,7 +4,7 @@ Description=Setup hugepages
 [Service]
 Type=oneshot
 ExecStartPre=mkdir -p /var/run/mrzcpd/huge_pages
-ExecStart=python3 @MR_INSTALL_BINDIR@/dpdk-hugepages.py -m
+ExecStart=python3 @MR_INSTALL_PREFIX@/bin/dpdk-hugepages.py -m
 RemainAfterExit=yes
 ExecStop=umount /var/run/mrzcpd/huge_pages
 
diff --git a/tools/systemd/mrzcpd-hwdb-setup.service.in b/tools/systemd/mrzcpd_hwdb_setup.service.in
index 8a51487..bf2146f 100644
--- a/tools/systemd/mrzcpd-hwdb-setup.service.in
+++ b/tools/systemd/mrzcpd_hwdb_setup.service.in
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=oneshot
-ExecStart=python3 @MR_INSTALL_BINDIR@/dpdk-devbind.py --status-dev net --dump /var/run/mrzcpd/hwfile.json
+ExecStart=python3 @MR_INSTALL_PREFIX@/bin/dpdk-devbind.py --status-dev net --dump /var/run/mrzcpd/hwfile.json
 RemainAfterExit=yes
 
 [Install]