From c463d39ddcf8f28df0790bd4e5fda8aab3243a84 Mon Sep 17 00:00:00 2001 From: Kent Russell Date: Mon, 25 Nov 2019 10:49:30 -0500 Subject: [PATCH] Set package name explicitly Instead of letting CPack generate the filename according to CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}, set the package name ourselves. Also take the change to fix the name of hsakmt-dev to hsakmt-devel for RPM, since that's their convention Previous packaging format: hsakmt-roct-1.0.9-229-g2144854-Linux.deb hsakmt-roct-1.0.9-229-g2144854-Linux.rpm hsakmt-roct-dev-1.0.9-229-g2144854-Linux.deb hsakmt-roct-dev-1.0.9-229-g2144854-Linux.rpm New format: hsakmt-roct-1.0.9-292-gc66f8cf.x86_64.deb hsakmt-roct-1.0.9-292-gc66f8cf.x86_64.rpm hsakmt-roct-dev-1.0.9-292-gc66f8cf.x86_64.deb hsakmt-roct-devel-1.0.9-292-gc66f8cf.x86_64.rpm Change-Id: I4fc4e0fd2eafd25669c1cfffb39860e25a0b645c Signed-off-by: Kent Russell [ROCm/ROCR-Runtime commit: 57b42045d027fc40ff386c771158f1e6dba9f7df] --- projects/rocr-runtime/CMakeLists.txt | 1 + projects/rocr-runtime/hsakmt-dev.txt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/projects/rocr-runtime/CMakeLists.txt b/projects/rocr-runtime/CMakeLists.txt index 1bf4e8cf15..3e4b5b3b38 100644 --- a/projects/rocr-runtime/CMakeLists.txt +++ b/projects/rocr-runtime/CMakeLists.txt @@ -167,6 +167,7 @@ set ( CPACK_PACKAGE_VERSION_PATCH ${BUILD_VERSION_PATCH} ) set ( CPACK_PACKAGE_CONTACT "Advanced Micro Devices Inc." ) set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "HSAKMT library for AMD KFD support" ) set ( CPACK_RESOURCE_FILE_LICENSE "${SOURCE_DIR}/LICENSE.md" ) +set ( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}.x86_64" ) #checking for OS-version if( EXISTS "/etc/os-release" ) diff --git a/projects/rocr-runtime/hsakmt-dev.txt b/projects/rocr-runtime/hsakmt-dev.txt index ba9406d17d..5c350b7e1a 100644 --- a/projects/rocr-runtime/hsakmt-dev.txt +++ b/projects/rocr-runtime/hsakmt-dev.txt @@ -52,6 +52,7 @@ set ( CPACK_GENERATOR "DEB;RPM;TGZ" CACHE STRING "Default packaging generators. ## Packaging directives set ( CPACK_PACKAGE_NAME ${HSAKMT_DEV_PACKAGE} ) +set ( CPACK_RPM_PACKAGE_NAME "hsakmt-roct-devel" ) set ( CPACK_PACKAGE_VENDOR "AMD" ) set ( CPACK_PACKAGE_VERSION_MAJOR ${BUILD_VERSION_MAJOR} ) set ( CPACK_PACKAGE_VERSION_MINOR ${BUILD_VERSION_MINOR} ) @@ -59,6 +60,8 @@ set ( CPACK_PACKAGE_VERSION_PATCH ${BUILD_VERSION_PATCH} ) set ( CPACK_PACKAGE_CONTACT "Advanced Micro Devices Inc." ) set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "HSAKMT development package." ) set ( CPACK_RESOURCE_FILE_LICENSE "${SOURCE_DIR}/LICENSE.md" ) +set ( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}.x86_64" ) +set ( CPACK_RPM_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}.x86_64.rpm" ) # Debian package specific variables set ( CPACK_DEBIAN_PACKAGE_DEPENDS "${HSAKMT_PACKAGE} (=${BUILD_VERSION_MAJOR}.${BUILD_VERSION_MINOR}.${BUILD_VERSION_PATCH})" )