From f7e311ba3d373f4e60b32bc2ddea847d4181f04d Mon Sep 17 00:00:00 2001 From: Cole Nelson Date: Wed, 24 Jun 2020 12:00:43 -0700 Subject: [PATCH] packaging/hip-rocclr.txt: multi-version install broken because of 'hip_rocclr' Versioning understands 'hip-rocclr' not the deprecated 'hip_rocclr'. Remove this. Leaving Provides hip-hcc until package shifts settle down. SWDEV-242143: Change-Id: I489fa28dd1394625bc6016a3adda4f73d02da202 Signed-off-by: Cole Nelson [ROCm/hip commit: 35e429d10f19930e68e04c63bb547445af47ab15] --- projects/hip/packaging/hip-rocclr.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/projects/hip/packaging/hip-rocclr.txt b/projects/hip/packaging/hip-rocclr.txt index c9221a64c6..0e185bd69e 100644 --- a/projects/hip/packaging/hip-rocclr.txt +++ b/projects/hip/packaging/hip-rocclr.txt @@ -41,9 +41,7 @@ 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, rocm-utils, hip-base (= ${CPACK_PACKAGE_VERSION}), comgr (>= 1.1), llvm-amdgpu") -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_DEBIAN_PACKAGE_PROVIDES "hip-hcc (= ${CPACK_PACKAGE_VERSION})") 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 +49,7 @@ 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, rocm-utils, hip-base = ${HIP_BASE_VERSION}, comgr >= 1.1, llvm-amdgpu") -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_PACKAGE_PROVIDES "hip-hcc = ${HIP_BASE_VERSION}") set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack)