Skip to content

Commit 637eaec

Browse files
committed
SWDEV-505539 - Correct the provides field of hsa-rocr and has-rocr-devel package
runtime and devel packages are providing the deprecated package hsakmt. Only devel package need to provide the same Change the package replaces/obsoletes field accordingly Conflict field is required for debian use case to remove the deprecated package on upgrade Change-Id: Ia1a4f128a1f6928faf57faee5f301a77c21acca2 (cherry picked from commit 2970545)
1 parent e3b8ad0 commit 637eaec

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

CMakeLists.txt

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -183,16 +183,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/Binary/prerm.in DEBIAN/Binary/
183183
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/preinst DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/DEBIAN)
184184
set (CPACK_DEBIAN_BINARY_PACKAGE_CONTROL_EXTRA "DEBIAN/preinst;DEBIAN/Binary/postinst;DEBIAN/Binary/prerm")
185185
# Needed since some packages still say they need hsakmt-roct
186-
set(CPACK_DEBIAN_PACKAGE_REPLACES "hsakmt-roct,hsakmt-roct-dev,hsa-ext-rocr-dev")
187-
set(CPACK_DEBIAN_PACKAGE_PROVIDES "hsakmt-roct")
188-
set(CPACK_DEBIAN_DEV_PACKAGE_REPLACES "hsakmt-roct,hsakmt-roct-dev")
189-
set(CPACK_DEBIAN_DEV_PACKAGE_PROVIDES "hsakmt-roct,hsakmt-roct-dev")
190-
set(CPACK_RPM_PACKAGE_OBSOLETES "hsakmt-roct,hsakmt-roct-devel,hsa-ext-rocr-dev")
191-
set(CPACK_RPM_PACKAGE_PROVIDES "hsakmt-roct,hsa-rocr-dev,hsa-ext-rocr-dev")
192-
set(CPACK_RPM_DEV_PACKAGE_PROVIDES "hsakmt-roct,hsakmt-roct-devel")
193-
set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "hsakmt-roct,hsakmt-roct-devel")
194-
195-
186+
set(CPACK_DEBIAN_DEV_PACKAGE_REPLACES "hsakmt-roct,hsakmt-roct-dev,hsa-ext-rocr-dev")
187+
set(CPACK_DEBIAN_DEV_PACKAGE_PROVIDES "hsakmt-roct,hsakmt-roct-dev,hsa-ext-rocr-dev")
188+
#TODO: hsa-ext-rocr-dev can be added to conflicts list and remove CPACK_DEBIAN_DEV_PACKAGE_BREAKS
189+
set(CPACK_DEBIAN_DEV_PACKAGE_CONFLICTS "hsakmt-roct,hsakmt-roct-dev")
196190
# package dependencies
197191
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libdrm-amdgpu-dev | libdrm-dev, rocm-core")
198192
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libdrm-amdgpu-dev")
@@ -214,15 +208,16 @@ if (HSA_DEP_ROCPROFILER_REGISTER)
214208
string(APPEND CPACK_DEBIAN_BINARY_PACKAGE_DEPENDS ", rocprofiler-register")
215209
endif()
216210
# Declare package relationships (hsa-ext-rocr-dev is a legacy package that we subsume)
217-
set(CPACK_DEBIAN_PACKAGE_BREAKS "hsa-ext-rocr-dev")
211+
set(CPACK_DEBIAN_DEV_PACKAGE_BREAKS "hsa-ext-rocr-dev")
218212

219213
# RPM package specific variables
220214
set(EL7_DISTRO "FALSE")
221215
Checksetel7(EL7_DISTRO)
222216
set(CPACK_RPM_BINARY_PACKAGE_NAME "hsa-rocr")
223217
# Since we changed the package name to match RPM specs, take care of older builds that had -dev installed
224218
# Also cover the fact that this now replaces the old binary package hsakmt-roct
225-
set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "hsakmt-roct-dev hsakmt-roct")
219+
set(CPACK_RPM_DEV_PACKAGE_PROVIDES "hsakmt-roct,hsakmt-roct-devel,hsakmt-roct-dev,hsa-ext-rocr-dev")
220+
set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "hsakmt-roct,hsakmt-roct-devel,hsakmt-roct-dev,hsa-ext-rocr-dev")
226221

227222
set(CPACK_RPM_DEV_PACKAGE_NAME "hsa-rocr-devel")
228223
set(CPACK_RPM_ASAN_PACKAGE_NAME "hsa-rocr-asan")

0 commit comments

Comments
 (0)