Correct the provides field of hsa-rocr and has-rocr-devel package
runtime and devel packages are providing the hsakmt packages. Only devel package need to provide the same
Change the package replaces/obsoletes field accordingly
Change-Id: Ia1a4f128a1f6928faf57faee5f301a77c21acca2
[ROCm/ROCR-Runtime commit: 2970545ded]
Этот коммит содержится в:
@@ -183,15 +183,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/Binary/prerm.in DEBIAN/Binary/
|
||||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/preinst DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/DEBIAN)
|
||||
set (CPACK_DEBIAN_BINARY_PACKAGE_CONTROL_EXTRA "DEBIAN/preinst;DEBIAN/Binary/postinst;DEBIAN/Binary/prerm")
|
||||
# Needed since some packages still say they need hsakmt-roct
|
||||
set(CPACK_DEBIAN_PACKAGE_REPLACES "hsakmt-roct,hsakmt-roct-dev,hsa-ext-rocr-dev")
|
||||
set(CPACK_DEBIAN_PACKAGE_PROVIDES "hsakmt-roct")
|
||||
set(CPACK_DEBIAN_DEV_PACKAGE_REPLACES "hsakmt-roct,hsakmt-roct-dev")
|
||||
set(CPACK_DEBIAN_DEV_PACKAGE_PROVIDES "hsakmt-roct,hsakmt-roct-dev")
|
||||
set(CPACK_RPM_PACKAGE_OBSOLETES "hsakmt-roct,hsakmt-roct-devel,hsa-ext-rocr-dev")
|
||||
set(CPACK_RPM_PACKAGE_PROVIDES "hsakmt-roct,hsa-rocr-dev,hsa-ext-rocr-dev")
|
||||
set(CPACK_RPM_DEV_PACKAGE_PROVIDES "hsakmt-roct,hsakmt-roct-devel")
|
||||
set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "hsakmt-roct,hsakmt-roct-devel")
|
||||
|
||||
set(CPACK_DEBIAN_DEV_PACKAGE_REPLACES "hsakmt-roct,hsakmt-roct-dev,hsa-ext-rocr-dev")
|
||||
set(CPACK_DEBIAN_DEV_PACKAGE_PROVIDES "hsakmt-roct,hsakmt-roct-dev,hsa-ext-rocr-dev")
|
||||
set(CPACK_RPM_DEV_PACKAGE_PROVIDES "hsakmt-roct,hsakmt-roct-devel,hsa-ext-rocr-dev")
|
||||
set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "hsakmt-roct,hsakmt-roct-devel,hsa-ext-rocr-dev")
|
||||
|
||||
# package dependencies
|
||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libdrm-amdgpu-dev | libdrm-dev, rocm-core")
|
||||
@@ -214,7 +209,7 @@ if (HSA_DEP_ROCPROFILER_REGISTER)
|
||||
string(APPEND CPACK_DEBIAN_BINARY_PACKAGE_DEPENDS ", rocprofiler-register")
|
||||
endif()
|
||||
# Declare package relationships (hsa-ext-rocr-dev is a legacy package that we subsume)
|
||||
set(CPACK_DEBIAN_PACKAGE_BREAKS "hsa-ext-rocr-dev")
|
||||
set(CPACK_DEBIAN_DEV_PACKAGE_BREAKS "hsa-ext-rocr-dev")
|
||||
|
||||
# RPM package specific variables
|
||||
set(EL7_DISTRO "FALSE")
|
||||
|
||||
Ссылка в новой задаче
Block a user