From 24bad55dc7bee92255bb9795f280a14db2f549ea Mon Sep 17 00:00:00 2001 From: Cole Nelson Date: Tue, 14 Jul 2020 15:08:53 -0700 Subject: [PATCH] packaging: set arch, field separators, vendor info Enables standards compliant package naming for debian and rpm. Change-Id: Iad86bf942b4e2938516ef46cda6fa2e4bb3744cc Signed-off-by: Cole Nelson --- runtime/hsa-runtime/CMakeLists.txt | 6 ++++-- runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/runtime/hsa-runtime/CMakeLists.txt b/runtime/hsa-runtime/CMakeLists.txt index 9de7842a75..373c2e2029 100644 --- a/runtime/hsa-runtime/CMakeLists.txt +++ b/runtime/hsa-runtime/CMakeLists.txt @@ -393,9 +393,9 @@ set (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1) set (CPACK_COMPONENTS_ALL binary dev) set ( CPACK_PACKAGE_NAME "hsa-rocr-dev" ) -set ( CPACK_PACKAGE_VENDOR "AMD" ) +set ( CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc." ) set ( CPACK_PACKAGE_VERSION ${PACKAGE_VERSION_STRING} ) -set ( CPACK_PACKAGE_CONTACT "Advanced Micro Devices Inc." ) +set ( CPACK_PACKAGE_CONTACT "Advanced Micro Devices, Inc." ) set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMD Heterogeneous System Architecture HSA - Linux HSA Runtime for Boltzmann (ROCm) platforms" ) set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md" ) @@ -404,6 +404,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/post_install DEBIAN/postinst @ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/pre_remove DEBIAN/prerm @ONLY) # Debian package specific variables +set ( CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT" ) set ( CPACK_DEBIAN_PACKAGE_DEPENDS "hsakmt-roct" ) set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/RadeonOpenCompute/ROCR-Runtime" ) set ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "DEBIAN/postinst;DEBIAN/prerm" ) @@ -415,6 +416,7 @@ set ( CPACK_DEBIAN_PACKAGE_REPLACES "hsa-ext-rocr-dev" ) set ( CPACK_DEBIAN_PACKAGE_CONFLICTS "hsa-ext-rocr-dev" ) ## RPM package specific variables +set ( CPACK_RPM_FILE_NAME "RPM-DEFAULT" ) set ( CPACK_RPM_PACKAGE_DEPENDS "hsakmt-roct" ) # Declare that this package will replace functionality provided by hsa-ext-rocr-dev package diff --git a/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt b/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt index 60b3680b38..866dcfac2b 100644 --- a/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt +++ b/runtime/packages/hsa-ext-rocr-dev/CMakeLists.txt @@ -64,19 +64,21 @@ set( PACKAGE_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}. set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Package types to build") set ( CPACK_PACKAGE_NAME ${PROJECT_NAME} ) -set ( CPACK_PACKAGE_VENDOR "AMD" ) +set ( CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc." ) set ( CPACK_PACKAGE_VERSION ${PACKAGE_VERSION_STRING} ) -set ( CPACK_PACKAGE_CONTACT "Advanced Micro Devices Inc." ) +set ( CPACK_PACKAGE_CONTACT "Advanced Micro Devices, Inc." ) set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMD Heterogeneous System Architecture HSA - Linux HSA Runtime extensions for ROCm platforms" ) set ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/description" ) set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/copyright" ) # Debian package specific variables +set ( CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT" ) set ( CPACK_DEBIAN_PACKAGE_DEPENDS "hsakmt-roct, hsa-rocr-dev" ) set ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/RadeonOpenCompute/ROCR-Runtime" ) set ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/prerm" ) # RPM package specific variables +set ( CPACK_RPM_FILE_NAME "RPM-DEFAULT" ) set ( CPACK_RPM_PACKAGE_DEPENDS "hsakmt-roct, hsa-rocr-dev" ) set ( CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm_post" ) set ( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm_postun" )