fix debuginfo missing.v4.6.69-20240103

15 files changed, 72 insertions, 67 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18b010c..9897e77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,12 +99,16 @@ include_directories(include/internal)
 
 # Install Dirs
 set(MR_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-set(MR_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${MACHINE}/lib)
-set(MR_INSTALL_BINDIR ${CMAKE_INSTALL_PREFIX}/${MACHINE}/bin)
-set(MR_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${MACHINE}/include)
-set(MR_INSTALL_SYSCONFDIR ${CMAKE_INSTALL_PREFIX}/${MACHINE}/etc)
-set(MR_INSTALL_SYSTEM ${CMAKE_INSTALL_PREFIX}/${MACHINE}/system)
-set(MR_INSTALL_UPDATE_ALTERNATIVES ${CMAKE_INSTALL_PREFIX}/${MACHINE}/update_alternatives)
+set(MR_INSTALL_LIBDIR ${MACHINE}/lib)
+set(MR_INSTALL_BINDIR ${MACHINE}/bin)
+set(MR_INSTALL_INCLUDEDIR ${MACHINE}/include)
+set(MR_INSTALL_SYSTEM ${MACHINE}/system)
+
+set(MR_ALTERNATIVE_PREFIX ${CMAKE_INSTALL_PREFIX})
+set(MR_ALTERNATIVE_LIBDIR ${MR_ALTERNATIVE_PREFIX}/lib)
+set(MR_ALTERNATIVE_BINDIR ${MR_ALTERNATIVE_PREFIX}/bin)
+set(MR_ALTERNATIVE_INCLUDEDIR ${MR_ALTERNATIVE_PREFIX}/include)
+
 set(MR_INSTALL_LDCONFDIR /etc/ld.so.conf.d/)
 set(MR_INSTALL_SYSUNITCONFDIR /etc/sysconfig/)
 set(MR_INSTALL_PROFILEDIR /etc/profile.d/)
diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 30f6eae..bf90b4e 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -20,6 +20,7 @@ set(CPACK_RPM_PACKAGE_VENDOR "Mesasoft@IIE")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
 set(CPACK_RPM_PACKAGE_RELEASE_DIST on)
 set(CPACK_RPM_DEBUGINFO_PACKAGE on)
+# set(CPACK_RPM_PACKAGE_DEBUG ON)
 configure_file(${CMAKE_SOURCE_DIR}/cmake/PostInstall.in ${CMAKE_BINARY_DIR}/PostInstall.in @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in ${CMAKE_BINARY_DIR}/PostUninstall.in @ONLY)
 set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_BINARY_DIR}/PostInstall.in)
diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in
index 8cb02aa..4e9d5e3 100644
--- a/cmake/PostInstall.in
+++ b/cmake/PostInstall.in
@@ -1,5 +1,5 @@
 altdir_path="@CMAKE_INSTALL_PREFIX@/altdir"
-mrzcpd_bin_path="@CMAKE_INSTALL_PREFIX@/bin"
+mrzcpd_bin_path="@MR_ALTERNATIVE_BINDIR@"
 
 if [ ! -d "$altdir_path" ]; then
   mkdir -p "$altdir_path"
@@ -11,82 +11,82 @@ fi
 
 command="update-alternatives --altdir @CMAKE_INSTALL_PREFIX@/altdir \
                                          --install \
-                                         @CMAKE_INSTALL_PREFIX@/bin/mrzcpd \
+                                         @MR_ALTERNATIVE_BINDIR@/mrzcpd \
                                          mrzcpd \
-                                         @MR_INSTALL_BINDIR@/mrzcpd \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/mrzcpd \
                                          @ALTERANTIVES_PRIORITY@ \
 										 --slave \
-                                         @CMAKE_INSTALL_PREFIX@/bin/mrtools-pinfo \
+                                         @MR_ALTERNATIVE_BINDIR@/mrtools-pinfo \
                                          mrtools-pinfo \
-                                         @MR_INSTALL_BINDIR@/mrtools-pinfo \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/mrtools-pinfo \
 										 --slave \
-                                         @CMAKE_INSTALL_PREFIX@/bin/mrpdump \
+                                         @MR_ALTERNATIVE_BINDIR@/mrpdump \
                                          mrpdump\
-                                         @MR_INSTALL_BINDIR@/mrpdump \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/mrpdump \
 										 --slave \
-                                         @CMAKE_INSTALL_PREFIX@/bin/monit_stream \
+                                         @MR_ALTERNATIVE_BINDIR@/monit_stream \
                                          monit_stream\
-                                         @MR_INSTALL_BINDIR@/monit_stream \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/monit_stream \
 										 --slave \
-                                         @CMAKE_INSTALL_PREFIX@/bin/monit_device \
+                                         @MR_ALTERNATIVE_BINDIR@/monit_device \
                                          monit_device \
-                                         @MR_INSTALL_BINDIR@/monit_device \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/monit_device \
 										 --slave \
-                                         @CMAKE_INSTALL_PREFIX@/bin/monit_obp \
+                                         @MR_ALTERNATIVE_BINDIR@/monit_obp \
                                          monit_obp \
-                                         @MR_INSTALL_BINDIR@/monit_obp \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/monit_obp \
 										 --slave \
-                                         @CMAKE_INSTALL_PREFIX@/bin/dpdk-hugepages.py \
+                                         @MR_ALTERNATIVE_BINDIR@/dpdk-hugepages.py \
                                          dpdk-hugepages.py \
-                                         @MR_INSTALL_BINDIR@/dpdk-hugepages.py \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/dpdk-hugepages.py \
 										 --slave \
-                                         @CMAKE_INSTALL_PREFIX@/bin/dpdk-devbind.py \
+                                         @MR_ALTERNATIVE_BINDIR@/dpdk-devbind.py \
                                          dpdk-devbind.py \
-                                         @MR_INSTALL_BINDIR@/dpdk-devbind.py \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/dpdk-devbind.py \
 										 --slave \
-                                         @CMAKE_INSTALL_PREFIX@/bin/devbind.py \
+                                         @MR_ALTERNATIVE_BINDIR@/devbind.py \
                                          devbind.py \
-                                         @MR_INSTALL_BINDIR@/devbind.py \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/devbind.py \
 										 --slave \
-                                         @CMAKE_INSTALL_PREFIX@/bin/mrmarch \
+                                         @MR_ALTERNATIVE_BINDIR@/mrmarch \
                                          mrmarch \
-                                         @MR_INSTALL_BINDIR@/mrmarch \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/mrmarch \
                                          --slave \
                                          @CMAKE_INSTALL_PREFIX@/lib \
                                          lib \
-                                         @MR_INSTALL_LIBDIR@ \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_LIBDIR@ \
                                          --slave \
                                          @CMAKE_INSTALL_PREFIX@/include \
                                          include \
-                                         @MR_INSTALL_INCLUDEDIR@ \
+                                          @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_INCLUDEDIR@ \
                                          --slave \
                                          /usr/lib/systemd/system/mrapm_device.service \
                                          mrapm_device.service \
-                                         @MR_INSTALL_SYSTEM@/mrapm_device.service \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_SYSTEM@/mrapm_device.service \
                                          --slave \
                                          /usr/lib/systemd/system/mrapm_stream.service \
                                          mrapm_stream.service \
-                                         @MR_INSTALL_SYSTEM@/mrapm_stream.service \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_SYSTEM@/mrapm_stream.service \
                                          --slave \
                                          /usr/lib/systemd/system/mrapm_obp.service \
                                          mrapm_obp.service \
-                                         @MR_INSTALL_SYSTEM@/mrapm_obp.service \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_SYSTEM@/mrapm_obp.service \
                                          --slave \
                                          /usr/lib/systemd/system/mrtunnat.service \
                                          mrtunnat.service \
-                                         @MR_INSTALL_SYSTEM@/mrtunnat.service \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_SYSTEM@/mrtunnat.service \
                                          --slave \
                                          /usr/lib/systemd/system/mrzcpd_hugepages_setup.service \
                                          mrzcpd_hugepages_setup.service \
-                                         @MR_INSTALL_SYSTEM@/mrzcpd_hugepages_setup.service \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_SYSTEM@/mrzcpd_hugepages_setup.service \
                                          --slave \
                                          /usr/lib/systemd/system/mrzcpd_hwdb_setup.service \
                                          mrzcpd_hwdb_setup.service \
-                                         @MR_INSTALL_SYSTEM@/mrzcpd_hwdb_setup.service \
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_SYSTEM@/mrzcpd_hwdb_setup.service \
                                          --slave \
                                          /usr/lib/systemd/system/mrzcpd.service\
                                          mrzcpd.service \
-                                         @MR_INSTALL_SYSTEM@/mrzcpd.service "
+                                         @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_SYSTEM@/mrzcpd.service "
 eval $command
 
 %systemd_post mrenv.service mrzcpd.service mrtunnat.service mrzcpd_hwdb_setup.service mrzcpd_hugepages_setup.service
diff --git a/cmake/PostUninstall.in b/cmake/PostUninstall.in
index 9e8184f..13f0a89 100644
--- a/cmake/PostUninstall.in
+++ b/cmake/PostUninstall.in
@@ -1,5 +1,5 @@
 %systemd_postun_with_restart mrenv.service mrzcpd.service mrtunnat.service
 /sbin/ldconfig
 
-command="update-alternatives --remove mrzcpd @MR_INSTALL_BINDIR@/mrzcpd --altdir @CMAKE_INSTALL_PREFIX@/altdir"
+command="update-alternatives --remove mrzcpd @CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/mrzcpd --altdir @CMAKE_INSTALL_PREFIX@/altdir"
 eval $command
diff --git a/conf/mrzcpd.ld.conf.in b/conf/mrzcpd.ld.conf.in
index d039159..9b844b5 100644
--- a/conf/mrzcpd.ld.conf.in
+++ b/conf/mrzcpd.ld.conf.in
@@ -1,2 +1,2 @@
 # Marsio ZeroCopy Driver Library Path
-@MR_INSTALL_PREFIX@/lib
+@MR_ALTERNATIVE_LIBDIR@
diff --git a/conf/mrzcpd.pc.in b/conf/mrzcpd.pc.in
index 2e7ae4a..a9ddf17 100644
--- a/conf/mrzcpd.pc.in
+++ b/conf/mrzcpd.pc.in
@@ -1,11 +1,11 @@
-prefix=@MR_INSTALL_PREFIX@

-exec_prefix=@MR_INSTALL_PREFIX@

-libdir=@MR_INSTALL_LIBDIR@

-includedir=@MR_INSTALL_INCLUDEDIR@

-bindir=@MR_INSTALL_BINDIR@

+prefix=@MR_ALTERNATIVE_PREFIX@

+exec_prefix=@MR_ALTERNATIVE_PREFIX@

+libdir=@MR_ALTERNATIVE_LIBDIR@

+includedir=@MR_ALTERNATIVE_INCLUDEDIR@

+bindir=@MR_ALTERNATIVE_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
+Libs: -L@MR_ALTERNATIVE_LIBDIR@ -lmarsio

+Cflags: -I@MR_ALTERNATIVE_INCLUDEDIR@
\ No newline at end of file
diff --git a/conf/mrzcpd.sh.in b/conf/mrzcpd.sh.in
index e783607..8af6a9d 100644
--- a/conf/mrzcpd.sh.in
+++ b/conf/mrzcpd.sh.in
@@ -1,34 +1,34 @@
 if [ -z "$MRZCPD_VARS_SETUP" ]; then
 		if [ "$PATH" ]; then
-                export PATH=@MR_INSTALL_PREFIX@/bin:$PATH
+                export PATH=@MR_ALTERNATIVE_BINDIR@:$PATH
         else
-                export PATH=@MR_INSTALL_PREFIX@/bin
+                export PATH=@MR_ALTERNATIVE_BINDIR@
         fi
 
 		if [ "$C_INCLUDE_PATH" ]; then
-                export C_INCLUDE_PATH=@MR_INSTALL_PREFIX@/include:$C_INCLUDE_PATH
+                export C_INCLUDE_PATH=@MR_ALTERNATIVE_INCLUDEDIR@:$C_INCLUDE_PATH
         else
-                export C_INCLUDE_PATH=@MR_INSTALL_PREFIX@/include
+                export C_INCLUDE_PATH=@MR_ALTERNATIVE_INCLUDEDIR@
         fi
 
         if [ "$CPLUS_INCLUDE_PATH" ]; then
-                export CPLUS_INCLUDE_PATH=@MR_INSTALL_PREFIX@/include:$CPLUS_INCLUDE_PATH
+                export CPLUS_INCLUDE_PATH=@MR_ALTERNATIVE_INCLUDEDIR@:$CPLUS_INCLUDE_PATH
         else
-                export CPLUS_INCLUDE_PATH=@MR_INSTALL_PREFIX@/include
+                export CPLUS_INCLUDE_PATH=@MR_ALTERNATIVE_INCLUDEDIR@
         fi
 
         #for linking
         if [ "$LIBRARY_PATH" ]; then
-                export LIBRARY_PATH=@MR_INSTALL_PREFIX@/lib:$LIBRARY_PATH
+                export LIBRARY_PATH=@MR_ALTERNATIVE_LIBDIR@:$LIBRARY_PATH
         else
-                export LIBRARY_PATH=@MR_INSTALL_PREFIX@/lib
+                export LIBRARY_PATH=@MR_ALTERNATIVE_LIBDIR@
         fi
 
 		#pkgconfig
         if [ "$PKG_CONFIG_PATH" ]; then
-                export PKG_CONFIG_PATH=@MR_INSTALL_PREFIX@/lib/pkgconfig:$PKG_CONFIG_PATH
+                export PKG_CONFIG_PATH=@MR_ALTERNATIVE_LIBDIR@/pkgconfig:$PKG_CONFIG_PATH
         else
-                export PKG_CONFIG_PATH=@MR_INSTALL_PREFIX@/lib/pkgconfig
+                export PKG_CONFIG_PATH=@MR_ALTERNATIVE_LIBDIR@/pkgconfig
         fi
 
         export MRZCPD_VARS_SETUP=1
diff --git a/tools/systemd/mrapm_device.service.in b/tools/systemd/mrapm_device.service.in
index b3e998c..bc442ac 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_PREFIX@/bin/monit_device --prometheus-client
+ExecStart=@MR_ALTERNATIVE_BINDIR@/monit_device --prometheus-client
 RestartSec=10s
 Restart=always
 PrivateTmp=True
diff --git a/tools/systemd/mrapm_obp.service.in b/tools/systemd/mrapm_obp.service.in
index 34bf70c..cf3c1f5 100644
--- a/tools/systemd/mrapm_obp.service.in
+++ b/tools/systemd/mrapm_obp.service.in
@@ -5,7 +5,7 @@ Requires=mrzcpd.service
 
 [Service]
 Type=simple
-ExecStart=@MR_INSTALL_PREFIX@/bin/monit_obp --prometheus-client
+ExecStart=@MR_ALTERNATIVE_BINDIR@/monit_obp --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 473c2a8..bb21718 100644
--- a/tools/systemd/mrapm_stream.service.in
+++ b/tools/systemd/mrapm_stream.service.in
@@ -5,7 +5,7 @@ Requires=mrzcpd.service
 
 [Service]
 Type=simple
-ExecStart=@CMAKE_INSTALL_PREFIX@/bin/monit_stream --prometheus-client
+ExecStart=@MR_ALTERNATIVE_BINDIR@/monit_stream --prometheus-client
 RestartSec=10s
 Restart=always
 PrivateTmp=true
diff --git a/tools/systemd/mrmonit.service.in b/tools/systemd/mrmonit.service.in
index 80bf0e4..4e4a526 100644
--- a/tools/systemd/mrmonit.service.in
+++ b/tools/systemd/mrmonit.service.in
@@ -5,8 +5,8 @@ After=network.target
 [Service]
 Type=simple
 ExecStartPre=/usr/bin/systemctl is-active mrzcpd
-ExecStartPre=-@MR_INSTALL_BINDIR@/monit_device --sendlog-apm
-ExecStartPre=-@MR_INSTALL_BINDIR@/monit_stream --sendlog-apm
+ExecStartPre=-@CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/monit_device --sendlog-apm
+ExecStartPre=-@CMAKE_INSTALL_PREFIX@/@MR_INSTALL_BINDIR@/monit_stream --sendlog-apm
 ExecStart=/bin/true
 StartLimitInterval=0
 RestartSec=1s
diff --git a/tools/systemd/mrtunnat.service.in b/tools/systemd/mrtunnat.service.in
index d1a91b3..b82f7b9 100644
--- a/tools/systemd/mrtunnat.service.in
+++ b/tools/systemd/mrtunnat.service.in
@@ -6,7 +6,7 @@ After=mrenv.service
 [Service]
 EnvironmentFile=/etc/sysconfig/mrzcpd
 ExecStartPre=/usr/bin/systemctl is-active mrzcpd
-ExecStart=@CMAKE_INSTALL_PREFIX@/bin/mrtunnat -c @CMAKE_INSTALL_PREFIX@/etc/mrtunnat.conf
+ExecStart=@MR_ALTERNATIVE_BINDIR@/mrtunnat -c @CMAKE_INSTALL_PREFIX@/etc/mrtunnat.conf
 Restart=always
 RestartSec=5s
 Type=notify
diff --git a/tools/systemd/mrzcpd.service.in b/tools/systemd/mrzcpd.service.in
index 82166b2..f0b36d5 100644
--- a/tools/systemd/mrzcpd.service.in
+++ b/tools/systemd/mrzcpd.service.in
@@ -5,15 +5,15 @@ After=mrzcpd_hugepages_setup.service mrzcpd_hwdb_setup.service
 
 [Service]
 Environment=SYSTEMD_LOG_LEVEL=debug
-Environment=MLX5_GLUE_PATH=@MR_INSTALL_PREFIX@/lib
+Environment=MLX5_GLUE_PATH=@MR_ALTERNATIVE_LIBDIR@
 EnvironmentFile=/etc/sysconfig/mrzcpd
-ExecStartPre=python3 @MR_INSTALL_PREFIX@/bin/devbind.py bind
-ExecStart=@MR_INSTALL_PREFIX@/bin/mrzcpd -c @MR_INSTALL_PREFIX@/etc/mrglobal.conf
+ExecStartPre=python3 @MR_ALTERNATIVE_BINDIR@/devbind.py bind
+ExecStart=@MR_ALTERNATIVE_BINDIR@/mrzcpd -c @CMAKE_INSTALL_PREFIX@/etc/mrglobal.conf
 ExecStopPost=/bin/bash -c 'rm -f /run/mrzcpd/hugepages/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_PREFIX@/bin/devbind.py unbind
+ExecStopPost=python3 @MR_ALTERNATIVE_BINDIR@/devbind.py unbind
 
 Restart=always
 RestartSec=5s
diff --git a/tools/systemd/mrzcpd_hugepages_setup.service.in b/tools/systemd/mrzcpd_hugepages_setup.service.in
index 45e41ef..84d39ac 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/hugepages
-ExecStart=python3 @MR_INSTALL_PREFIX@/bin/dpdk-hugepages.py -m
+ExecStart=python3 @MR_ALTERNATIVE_BINDIR@/dpdk-hugepages.py -m
 RemainAfterExit=yes
 ExecStop=umount /var/run/mrzcpd/hugepages
 
diff --git a/tools/systemd/mrzcpd_hwdb_setup.service.in b/tools/systemd/mrzcpd_hwdb_setup.service.in
index bf2146f..6e22972 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_PREFIX@/bin/dpdk-devbind.py --status-dev net --dump /var/run/mrzcpd/hwfile.json
+ExecStart=python3 @MR_ALTERNATIVE_BINDIR@/dpdk-devbind.py --status-dev net --dump /var/run/mrzcpd/hwfile.json
 RemainAfterExit=yes
 
 [Install]