Skip to content

Commit 3be9c49

Browse files
raramakrdayatsin-amd
authored andcommitted
CMake: Add package conflict for the deprecated package hsakmt
For debian use cases, package conflict is required to remove the deprecated package during package upgrade Also removed the duplicate setting of package obseletes in RPM usecase.
1 parent 890399a commit 3be9c49

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,8 @@ set (CPACK_DEBIAN_BINARY_PACKAGE_CONTROL_EXTRA "DEBIAN/preinst;DEBIAN/Binary/pos
195195
# Needed since some packages still say they need hsakmt-roct
196196
set(CPACK_DEBIAN_DEV_PACKAGE_REPLACES "hsakmt-roct,hsakmt-roct-dev,hsa-ext-rocr-dev")
197197
set(CPACK_DEBIAN_DEV_PACKAGE_PROVIDES "hsakmt-roct,hsakmt-roct-dev,hsa-ext-rocr-dev")
198-
set(CPACK_RPM_DEV_PACKAGE_PROVIDES "hsakmt-roct,hsakmt-roct-devel,hsa-ext-rocr-dev")
199-
set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "hsakmt-roct,hsakmt-roct-devel,hsa-ext-rocr-dev")
200-
198+
#TODO: hsa-ext-rocr-dev can be added to conflicts list and remove CPACK_DEBIAN_DEV_PACKAGE_BREAKS
199+
set(CPACK_DEBIAN_DEV_PACKAGE_CONFLICTS "hsakmt-roct,hsakmt-roct-dev")
201200
# package dependencies
202201
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libdrm-amdgpu-dev | libdrm-dev, rocm-core")
203202
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libdrm-amdgpu-dev")
@@ -227,7 +226,8 @@ Checksetel7(EL7_DISTRO)
227226
set(CPACK_RPM_BINARY_PACKAGE_NAME "hsa-rocr")
228227
# Since we changed the package name to match RPM specs, take care of older builds that had -dev installed
229228
# Also cover the fact that this now replaces the old binary package hsakmt-roct
230-
set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "hsakmt-roct-dev hsakmt-roct")
229+
set(CPACK_RPM_DEV_PACKAGE_PROVIDES "hsakmt-roct,hsakmt-roct-devel,hsakmt-roct-dev,hsa-ext-rocr-dev")
230+
set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "hsakmt-roct,hsakmt-roct-devel,hsakmt-roct-dev,hsa-ext-rocr-dev")
231231

232232
set(CPACK_RPM_DEV_PACKAGE_NAME "hsa-rocr-devel")
233233
set(CPACK_RPM_ASAN_PACKAGE_NAME "hsa-rocr-asan")

0 commit comments

Comments
 (0)