Combine client and server packages

Now, only one package is generated. This works with older
versions of cmake.

Also, restore change to postinst scripts for Debian and
RPM, undone in a prevous commit.

Change-Id: Ica005656c5f1df0d01d3071584b97de9f0e61cb3
(cherry picked from commit c14d23843228fa146f38c87cb59514e855725b41)


[ROCm/rdc commit: 9483b74fe4]
Этот коммит содержится в:
Chris Freehill
2020-07-01 06:37:27 -05:00
родитель 27b7f174b3
Коммит caeb82122e
3 изменённых файлов: 5 добавлений и 13 удалений
+3 -11
Просмотреть файл
@@ -156,14 +156,6 @@ set(CPACK_PACKAGING_INSTALL_PREFIX ${RDC_SERVER_ROOT_PATH}
# define all the install component labels to install
set(SERVER_COMPONENT "server")
set(CLIENT_COMPONENT "client")
set(CPACK_RPM_SERVER_FILE_NAME
"${RDC_PACKAGE}-${SERVER_COMPONENT}_${PKG_VERSION_STR}.x86_64.rpm")
set(CPACK_DEBIAN_SERVER_FILE_NAME
"${RDC_PACKAGE}-${SERVER_COMPONENT}_${PKG_VERSION_STR}_amd64.deb")
set(CPACK_RPM_CLIENT_FILE_NAME
"${RDC_PACKAGE}-${CLIENT_COMPONENT}_${PKG_VERSION_STR}.x86_64.rpm")
set(CPACK_DEBIAN_CLIENT_FILE_NAME
"${RDC_PACKAGE}-${CLIENT_COMPONENT}_${PKG_VERSION_STR}_amd64.deb")
add_subdirectory("server")
add_subdirectory("client")
@@ -171,10 +163,10 @@ add_subdirectory("rdc_libs")
add_subdirectory("example")
add_subdirectory("rdci")
# Turn on cmake "component install"
set(CPACK_DEB_COMPONENT_INSTALL 1)
set(CPACK_RPM_COMPONENT_INSTALL 1)
set(CPACK_PACKAGE_FILE_NAME "${RDC_PACKAGE}_${PKG_VERSION_STR}")
# This is used by configure_file for *_postinit.in
set(RDC_CLIENT_ROOT_PATH "${RDC_SERVER_ROOT_PATH}/${RDC_CLIENT_INSTALL_PREFIX}")
configure_file(
"${PROJECT_SOURCE_DIR}/src/DEBIAN_postinst.in"
"${PROJECT_SOURCE_DIR}/DEBIAN/postinst")
+1 -1
Просмотреть файл
@@ -1,6 +1,6 @@
#/bin/bash
RDC_LIB_DIR=/opt/rocm/rdc/lib
RDC_LIB_DIR=@RDC_CLIENT_ROOT_PATH@/rdc/lib
# This will return 0 if an id is created and non-zero if
# it already exists
+1 -1
Просмотреть файл
@@ -1,6 +1,6 @@
#!/bin/bash
RDC_LIB_DIR=/opt/rocm/rdc/lib
RDC_LIB_DIR=@RDC_CLIENT_ROOT_PATH@/rdc/lib
do_create_rdc_user() {
useradd -r -s /bin/nologin rdc
}