From db3d4bc84856fc960b68ba6ddfedc658e5c8c109 Mon Sep 17 00:00:00 2001 From: Payam Date: Wed, 15 Apr 2020 18:49:08 -0400 Subject: [PATCH] updating package name to hip-rocclr instead of hip-vdi Change-Id: Ife8810d4dd224ce29c2e2a827b221a618c9f1b3d --- packaging/hip-samples.txt | 2 +- packaging/hip-vdi.txt | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packaging/hip-samples.txt b/packaging/hip-samples.txt index 1f3e088153..6f643c3865 100644 --- a/packaging/hip-samples.txt +++ b/packaging/hip-samples.txt @@ -26,7 +26,7 @@ set(CPACK_BINARY_RPM "ON") set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) -set(CPACK_RPM_PACKAGE_REQUIRES "hip-vdi = ${HIP_BASE_VERSION}") +set(CPACK_RPM_PACKAGE_REQUIRES "hip-rocclr = ${HIP_BASE_VERSION}") set(CPACK_RPM_PACKAGE_OBSOLETES "hip_samples") set(CPACK_RPM_PACKAGE_CONFLICTS "hip_samples") set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") diff --git a/packaging/hip-vdi.txt b/packaging/hip-vdi.txt index a1f33e9920..04eb892cc8 100644 --- a/packaging/hip-vdi.txt +++ b/packaging/hip-vdi.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.3) -project(hip_vdi) +project(hip_rocclr) install(FILES @PROJECT_BINARY_DIR@/lib/libamdhip64.so DESTINATION lib) install(FILES @PROJECT_BINARY_DIR@/lib/libamdhip64.so.@HIP_LIB_VERSION_MAJOR@ DESTINATION lib) @@ -27,9 +27,9 @@ foreach(_target_file ${_target_files}) endforeach() install(FILES ${_target_files} DESTINATION lib/cmake/hip) -set(CPACK_PACKAGE_NAME "hip-vdi") -set(HCC_PACKAGE_NAME "vdi") -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [VDI]") +set(CPACK_PACKAGE_NAME "hip-rocclr") +set(HCC_PACKAGE_NAME "rocclr") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [ROCClr]") set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.") set(CPACK_PACKAGE_CONTACT "Maneesh Gupta ") set(CPACK_PACKAGE_VERSION @HIP_VERSION_MAJOR@.@HIP_VERSION_MINOR@.@HIP_VERSION_PATCH@) @@ -41,9 +41,9 @@ set(CPACK_GENERATOR "TGZ;DEB;RPM") set(CPACK_BINARY_DEB "ON") set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm") set(CPACK_DEBIAN_PACKAGE_DEPENDS "hsa-rocr-dev, hsa-ext-rocr-dev, rocm-utils, hip-base (= ${CPACK_PACKAGE_VERSION}), comgr (>= 1.1), llvm-amdgpu") -set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip_vdi, hip-hcc (= ${CPACK_PACKAGE_VERSION})") -set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_vdi") -set(CPACK_DEBIAN_PACKAGE_CONFLICTS "hip_vdi") +set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip_rocclr, hip-hcc (= ${CPACK_PACKAGE_VERSION})") +set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_rocclr") +set(CPACK_DEBIAN_PACKAGE_CONFLICTS "hip_rocclr") set(CPACK_BINARY_RPM "ON") set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst") @@ -51,9 +51,9 @@ set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/prerm") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) set(CPACK_RPM_PACKAGE_REQUIRES "hsa-rocr-dev, hsa-ext-rocr-dev, rocm-utils, hip-base = ${HIP_BASE_VERSION}, comgr >= 1.1, llvm-amdgpu") -set(CPACK_RPM_PACKAGE_PROVIDES "hip_vdi, hip-hcc = ${HIP_BASE_VERSION}") -set(CPACK_RPM_PACKAGE_OBSOLETES "hip_vdi") -set(CPACK_RPM_PACKAGE_CONFLICTS "hip_vdi") +set(CPACK_RPM_PACKAGE_PROVIDES "hip_rocclr, hip-hcc = ${HIP_BASE_VERSION}") +set(CPACK_RPM_PACKAGE_OBSOLETES "hip_rocclr") +set(CPACK_RPM_PACKAGE_CONFLICTS "hip_rocclr") set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack)