From 3984277b1a460c009f32db1d3f31375cff74df73 Mon Sep 17 00:00:00 2001 From: Kent Russell Date: Fri, 7 Feb 2020 08:44:30 -0500 Subject: [PATCH] Fix naming conventions again for -dev package Using the building OS isn't guaranteed, as we can theoretically build RPMs in Ubuntu or DEBs in CentOS. Use CPack's DEB/RPM-specific variables to get around this issue Change-Id: I404246c070eac2c74b45ae4b763c612891d66de1 Signed-off-by: Kent Russell [ROCm/ROCR-Runtime commit: b72bbeac3e679a3b6507e36df913f846122c2109] --- projects/rocr-runtime/hsakmt-dev.txt | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/projects/rocr-runtime/hsakmt-dev.txt b/projects/rocr-runtime/hsakmt-dev.txt index 5286fc0f72..e22db6d836 100644 --- a/projects/rocr-runtime/hsakmt-dev.txt +++ b/projects/rocr-runtime/hsakmt-dev.txt @@ -25,17 +25,7 @@ cmake_minimum_required ( VERSION 3.5.0 ) -#checking for OS-version -if( EXISTS "/etc/os-release" ) - file( STRINGS "/etc/os-release" DISTRO_ID REGEX "^ID=" ) - string( REPLACE "ID=" "" DISTRO_ID "${DISTRO_ID}" ) -endif() - -if (DISTRO_ID STREQUAL "ubuntu" ) - set ( HSAKMT_DEV_PACKAGE "hsakmt-roct-dev" ) -else() - set ( HSAKMT_DEV_PACKAGE "hsakmt-roct-devel" ) -endif() +set ( HSAKMT_DEV_PACKAGE "hsakmt-roct-dev" ) project ( ${HSAKMT_DEV_PACKAGE} ) @@ -61,7 +51,8 @@ install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDI set ( CPACK_GENERATOR "DEB;RPM;TGZ" CACHE STRING "Default packaging generators." ) ## Packaging directives -set ( CPACK_PACKAGE_NAME ${HSAKMT_DEV_PACKAGE} ) +set ( CPACK_DEBIAN_PACKAGE_NAME "hsakmt-roct-dev" ) +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} ) @@ -69,7 +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_DEBIAN_FILE_NAME "${CPACK_DEBIAN_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}.x86_64.deb" ) +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})" ) set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface" )