diff --git a/projects/rdc/CMakeLists.txt b/projects/rdc/CMakeLists.txt index 9ef323a91f..7905933e3d 100755 --- a/projects/rdc/CMakeLists.txt +++ b/projects/rdc/CMakeLists.txt @@ -132,12 +132,19 @@ if (NOT DEFINED CPACK_PACKAGE_VENDOR) endif() if (NOT DEFINED CPACK_PACKAGE_CONTACT) - set(CPACK_PACKAGE_CONTACT "Advanced Micro Devices, Inc.") + set(CPACK_PACKAGE_CONTACT "RDC Support ") endif() if (NOT DEFINED CPACK_PACKAGE_DESCRIPTION_SUMMARY) -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY - "Radeon Data Center Tools") + set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMD Radeon Data Center") +endif() + +if (NOT DEFINED CPACK_PACKAGE_DESCRIPTION) + set(CPACK_PACKAGE_DESCRIPTION "This package contains the AMD Radeon Data Center tools.") +endif() + +if (NOT DEFINED CPACK_RESOURCE_FILE_LICENSE) + set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") endif() if (NOT RDC_PACKAGE) @@ -265,15 +272,18 @@ else() set(DISTRO_ROOT "/lib/systemd/system") endif() +# 755 permissions +set(INST_SCR_PERM "OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ + GROUP_EXECUTE WORLD_READ WORLD_EXECUTE") configure_file( "${PROJECT_SOURCE_DIR}/src/DEBIAN_postinst.in" - "${PROJECT_SOURCE_DIR}/DEBIAN/postinst") + "${PROJECT_SOURCE_DIR}/DEBIAN/postinst" FILE_PERMISSIONS ${INST_SCR_PERM}) configure_file( "${PROJECT_SOURCE_DIR}/src/RPM_rpm_post.in" - "${PROJECT_SOURCE_DIR}/RPM/rpm_post") + "${PROJECT_SOURCE_DIR}/RPM/rpm_post" FILE_PERMISSIONS ${INST_SCR_PERM}) configure_file( "${PROJECT_SOURCE_DIR}/src/RPM_postun.in" - "${PROJECT_SOURCE_DIR}/RPM/rpm_postun") + "${PROJECT_SOURCE_DIR}/RPM/rpm_postun" FILE_PERMISSIONS ${INST_SCR_PERM}) if ( DEFINED ENV{ROCM_LIBPATCH_VERSION} ) set ( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}.$ENV{ROCM_LIBPATCH_VERSION}" ) @@ -295,7 +305,7 @@ set ( CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT" ) set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/postinst; ${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/prerm") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "rocm-smi-lib") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "rocm-smi-lib, libc6") # RPM package specific variables if ( DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE} ) diff --git a/projects/rdc/DEBIAN/control b/projects/rdc/DEBIAN/control index df1ab8796c..577dc6f1e3 100644 --- a/projects/rdc/DEBIAN/control +++ b/projects/rdc/DEBIAN/control @@ -1,9 +1,8 @@ Package: rdc Architecture: amd64 -Maintainer: Advanced Micro Devices Inc. +Maintainer: Advanced Micro Devices (AMD) +Depends: Priority: optional Version: MODULE_VERSION -Depends: -Homepage: -Description: Radeon Data Center (RDC) Tools - +Description: AMD Radeon Data Center + This package contains the Radeon Data Center tools. diff --git a/projects/rdc/rdci/CMakeLists.txt b/projects/rdc/rdci/CMakeLists.txt index e76ad2c646..dd3083aef0 100644 --- a/projects/rdc/rdci/CMakeLists.txt +++ b/projects/rdc/rdci/CMakeLists.txt @@ -59,7 +59,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -std=c++11 -pthread ") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") if ("${CMAKE_BUILD_TYPE}" STREQUAL Release) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -s") else () set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -O0 -DDEBUG") endif () diff --git a/projects/rdc/server/CMakeLists.txt b/projects/rdc/server/CMakeLists.txt index 5536203400..437b4ee956 100755 --- a/projects/rdc/server/CMakeLists.txt +++ b/projects/rdc/server/CMakeLists.txt @@ -52,7 +52,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -std=c++11 ") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") if ("${CMAKE_BUILD_TYPE}" STREQUAL Release) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -s") else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -O0 -DDEBUG") endif() diff --git a/projects/rdc/src/DEBIAN_postinst.in b/projects/rdc/src/DEBIAN_postinst.in index 8342026f95..e29c770c10 100755 --- a/projects/rdc/src/DEBIAN_postinst.in +++ b/projects/rdc/src/DEBIAN_postinst.in @@ -1,4 +1,4 @@ -#/bin/bash +#!/bin/bash # This will return 0 if an id is created and non-zero if # it already exists