From e8b8e92ce3d101b06d448677aa5b4ec78cd1dade Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Wed, 5 Feb 2025 16:19:18 -0800 Subject: [PATCH] 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. [ROCm/ROCR-Runtime commit: 3be9c49b63ee8706c0a50fcc4aac65202f97dd81] --- projects/rocr-runtime/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/rocr-runtime/CMakeLists.txt b/projects/rocr-runtime/CMakeLists.txt index 56b09494c8..108371a0fb 100644 --- a/projects/rocr-runtime/CMakeLists.txt +++ b/projects/rocr-runtime/CMakeLists.txt @@ -195,9 +195,8 @@ set (CPACK_DEBIAN_BINARY_PACKAGE_CONTROL_EXTRA "DEBIAN/preinst;DEBIAN/Binary/pos # Needed since some packages still say they need hsakmt-roct 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") - +#TODO: hsa-ext-rocr-dev can be added to conflicts list and remove CPACK_DEBIAN_DEV_PACKAGE_BREAKS +set(CPACK_DEBIAN_DEV_PACKAGE_CONFLICTS "hsakmt-roct,hsakmt-roct-dev") # package dependencies set(CPACK_DEBIAN_PACKAGE_DEPENDS "libdrm-amdgpu-dev | libdrm-dev, rocm-core") set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libdrm-amdgpu-dev") @@ -227,7 +226,8 @@ Checksetel7(EL7_DISTRO) set(CPACK_RPM_BINARY_PACKAGE_NAME "hsa-rocr") # Since we changed the package name to match RPM specs, take care of older builds that had -dev installed # Also cover the fact that this now replaces the old binary package hsakmt-roct -set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "hsakmt-roct-dev hsakmt-roct") +set(CPACK_RPM_DEV_PACKAGE_PROVIDES "hsakmt-roct,hsakmt-roct-devel,hsakmt-roct-dev,hsa-ext-rocr-dev") +set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "hsakmt-roct,hsakmt-roct-devel,hsakmt-roct-dev,hsa-ext-rocr-dev") set(CPACK_RPM_DEV_PACKAGE_NAME "hsa-rocr-devel") set(CPACK_RPM_ASAN_PACKAGE_NAME "hsa-rocr-asan")