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 <cole.nelson@amd.com>
[ROCm/hip commit: 35e429d10f]
Этот коммит содержится в:
коммит произвёл
Cole Nelson
родитель
1336a9de0b
Коммит
f7e311ba3d
@@ -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)
|
||||
|
||||
Ссылка в новой задаче
Block a user