diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/Package.cmake | 62 | ||||
| -rw-r--r-- | cmake/PostInstall.in | 1 | ||||
| -rw-r--r-- | cmake/postinstall_mrzcpd.in | 21 | ||||
| -rw-r--r-- | cmake/postinstall_pcap.in | 20 | ||||
| -rw-r--r-- | cmake/preinstall.in | 1 | ||||
| -rw-r--r-- | service/sapp_default.service.in | 7 | ||||
| -rw-r--r-- | service/sapp_marsio.service.in | 8 |
8 files changed, 30 insertions, 92 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cbca796..73e1d5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,4 +252,6 @@ install(FILES ${PROJECT_SOURCE_DIR}/include/public/stream_inc/stream_rawpkt.h DE install(FILES ${PROJECT_SOURCE_DIR}/include/public/stream_inc/stream_tunnel.h DESTINATION /opt/MESA/include/MESA/stream_inc COMPONENT HEADER) install(FILES ${PROJECT_SOURCE_DIR}/include/public/stream_inc/sapp_inject.h DESTINATION /opt/MESA/include/MESA/stream_inc COMPONENT HEADER) +install(FILES ${CMAKE_BINARY_DIR}/service/sapp.service DESTINATION /usr/lib/systemd/system/ COMPONENT PROFILE) + include(Package) diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 6b9bb78..48d6f18 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -1,67 +1,47 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(MY_RPM_NAME_PREFIX "${project_name}") + set(CPACK_PACKAGE_NAME "${project_name}-debug") else() - set(MY_RPM_NAME_PREFIX "${project_name}") + set(CPACK_PACKAGE_NAME ${project_name}) endif() -message(STATUS "Package: ${MY_RPM_NAME_PREFIX}") +message(STATUS "Package: ${CPACK_PACKAGE_NAME}") set(CPACK_PACKAGE_VECDOR "MESA") set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${VERSION_BUILD}") set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) -set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}") -execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\"$6\".\"$7}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION) + +#set(CPACK_RPM_PACKAGE_DEBUG 1) # RPM Build set(CPACK_GENERATOR "RPM") +set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON) +set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") set(CPACK_RPM_PACKAGE_VENDOR "MESA") set(CPACK_RPM_PACKAGE_AUTOREQPROV "no") -set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on") -set(CPACK_RPM_DEBUGINFO_PACKAGE "on") -set(CPACK_RPM_PACKAGE_DEBUG 1) - -set(CPACK_RPM_COMPONENT_INSTALL ON) -set(CPACK_COMPONENTS_IGNORE_GROUPS 1) -set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP) -set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop") - -set(CPACK_COMPONENT_EXECUTABLE_REQUIRED FALSE) -set(CPACK_RPM_EXECUTABLE_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) -set(CPACK_RPM_EXECUTABLE_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") -set(CPACK_RPM_EXECUTABLE_DEBUGINFO_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") - -set(CPACK_COMPONENT_EXECUTABLE_GROUP "executable") -set(CPACK_COMPONENT_LIBRARY_GROUP "executable") -set(CPACK_COMPONENT_PROFILE_GROUP "executable") - -set(CPACK_COMPONENT_HEADER_REQUIRED FALSE) -set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel") -set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") -set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") -set(CPACK_COMPONENT_HEADER_GROUP "header") - -set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME}) -set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME}) - -set(CPACK_COMPONENTS_ALL LIBRARY HEADER EXECUTABLE PROFILE) - +set(CPACK_RPM_PACKAGE_RELEASE_DIST on) +set(CPACK_RPM_DEBUGINFO_PACKAGE off) set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}") # Must uninstall the debug package before install release package -set(CPACK_RPM_PACKAGE_CONFLICTS ${MY_RPM_NAME_PREFIX}) +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(CPACK_RPM_PACKAGE_CONFLICTS "${project_name}-debug") +else() + set(CPACK_RPM_PACKAGE_CONFLICTS ${project_name}) + # set(CPACK_STRIP_FILES TRUE) +endif() # setup %config(noreplace) set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/gdev.conf" "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/sapp.toml" - "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/send_raw_pkt.conf" - "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/project_list.conf" - "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/plugin.conf" - "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/entrylist.conf" - "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/plug/conflist.inf") + "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/send_raw_pkt.conf" + "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/project_list.conf" + "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/plugin.conf" + "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/etc/entrylist.conf" + "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/plug/conflist.inf") -# set(CPACK_STRIP_FILES TRUE) include(CPack) + diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in deleted file mode 100644 index 21c426b..0000000 --- a/cmake/PostInstall.in +++ /dev/null @@ -1 +0,0 @@ -%systemd_post sapp.service diff --git a/cmake/postinstall_mrzcpd.in b/cmake/postinstall_mrzcpd.in deleted file mode 100644 index 967bdae..0000000 --- a/cmake/postinstall_mrzcpd.in +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -sapp_install_dir=`rpm -qa --queryformat '%{instprefixes}\n' sapp` - -echo "[Unit]" > /tmp/.sapp.service.tmp -echo "Description=sapp service" >> /tmp/.sapp.service.tmp -echo "Requires=mrzcpd.service" >> /tmp/.sapp.service.tmp -echo "After=mrzcpd.service" >> /tmp/.sapp.service.tmp -echo "[Service]" >> /tmp/.sapp.service.tmp -echo "WorkingDirectory=$sapp_install_dir" >> /tmp/.sapp.service.tmp -echo "ExecStart=$sapp_install_dir/sapp" >> /tmp/.sapp.service.tmp -echo "Restart=always" >> /tmp/.sapp.service.tmp -echo "RestartSec=5s" >> /tmp/.sapp.service.tmp -echo "[Install]" >> /tmp/.sapp.service.tmp -echo "WantedBy=multi-user.target" >> /tmp/.sapp.service.tmp - -cp -f /tmp/.sapp.service.tmp /usr/lib/systemd/system/sapp.service -rm -f /tmp/.sapp.service.tmp - -systemctl enable sapp -systemctl daemon-reload
\ No newline at end of file diff --git a/cmake/postinstall_pcap.in b/cmake/postinstall_pcap.in deleted file mode 100644 index 1de7002..0000000 --- a/cmake/postinstall_pcap.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -sapp_install_dir=`rpm -qa --queryformat '%{instprefixes}\n' sapp` - -echo "[Unit]" > /tmp/.sapp.service.tmp -echo "Description=sapp service" >> /tmp/.sapp.service.tmp -echo "Requires=network.target" >> /tmp/.sapp.service.tmp -echo "After=network.target" >> /tmp/.sapp.service.tmp -echo "[Service]" >> /tmp/.sapp.service.tmp -echo "WorkingDirectory=$sapp_install_dir" >> /tmp/.sapp.service.tmp -echo "ExecStart=$sapp_install_dir/sapp" >> /tmp/.sapp.service.tmp -echo "Restart=always" >> /tmp/.sapp.service.tmp -echo "RestartSec=5s" >> /tmp/.sapp.service.tmp -echo "[Install]" >> /tmp/.sapp.service.tmp -echo "WantedBy=multi-user.target" >> /tmp/.sapp.service.tmp - -cp -f /tmp/.sapp.service.tmp /usr/lib/systemd/system/sapp.service -rm -f /tmp/.sapp.service.tmp - -systemctl daemon-reload
\ No newline at end of file diff --git a/cmake/preinstall.in b/cmake/preinstall.in deleted file mode 100644 index 1c27cc9..0000000 --- a/cmake/preinstall.in +++ /dev/null @@ -1 +0,0 @@ -systemctl stop sapp
\ No newline at end of file diff --git a/service/sapp_default.service.in b/service/sapp_default.service.in index 47e0dfa..9883e72 100644 --- a/service/sapp_default.service.in +++ b/service/sapp_default.service.in @@ -1,11 +1,10 @@ [Unit] Description=sapp service -Requires=sapp-env.service -After=sapp-env.service +After=After=network.target [Service] -WorkingDirectory=/opt/sapp/bin/ -ExecStart=/opt/sapp/bin/fake_sapp +WorkingDirectory=${CMAKE_INSTALL_PREFIX} +ExecStart=${CMAKE_INSTALL_PREFIX}/sapp Restart=always RestartSec=5s diff --git a/service/sapp_marsio.service.in b/service/sapp_marsio.service.in index 47e0dfa..2774069 100644 --- a/service/sapp_marsio.service.in +++ b/service/sapp_marsio.service.in @@ -1,11 +1,11 @@ [Unit] Description=sapp service -Requires=sapp-env.service -After=sapp-env.service +Requires=mrzcpd.service +After=mrzcpd.service [Service] -WorkingDirectory=/opt/sapp/bin/ -ExecStart=/opt/sapp/bin/fake_sapp +WorkingDirectory=${CMAKE_INSTALL_PREFIX} +ExecStart=${CMAKE_INSTALL_PREFIX}/sapp Restart=always RestartSec=5s |