From 2b6d73d3e77309b68a8f2b026b4cbe4cf354c79e Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Thu, 20 Jun 2024 16:02:32 -0700 Subject: [PATCH] SWDEV-464716 - Use the correct hsa devel package for RPM dependencies hsa-rocr-devel should be used for RPM dependency. Runtime package should depend on has-rocr Change-Id: I61a25c47d18f14686bbb55f5ccbf1f49d27bb9b0 --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37e31907c7..8ed42e5269 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,7 +366,7 @@ if(${LIBRARY_TYPE} STREQUAL SHARED) set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT") set(CPACK_DEBIAN_RUNTIME_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS - "rocminfo, hsa-rocr-dev, rocm-core, libsystemd-dev, libelf-dev, libnuma-dev, libpciaccess-dev, libxml2-dev" + "rocminfo, hsa-rocr, rocm-core, libsystemd-dev, libelf-dev, libnuma-dev, libpciaccess-dev, libxml2-dev" ) set(CPACK_DEBIAN_DEV_PACKAGE_NAME "${PROJECT_NAME}-dev") set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "${PROJECT_NAME}, hsa-rocr-dev, rocm-core") @@ -409,21 +409,21 @@ if(${LIBRARY_TYPE} STREQUAL SHARED) set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") set(CPACK_RPM_RUNTIME_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_RPM_RUNTIME_PACKAGE_REQUIRES - "rocminfo, hsa-rocr-dev, rocm-core, systemd-devel, libpciaccess-devel, libxml2-devel") + "rocminfo, hsa-rocr, rocm-core, systemd-devel, libpciaccess-devel, libxml2-devel") set(CPACK_RPM_DEV_PACKAGE_NAME "${PROJECT_NAME}-devel") - set(CPACK_RPM_DEV_PACKAGE_REQUIRES "${PROJECT_NAME}, hsa-rocr-dev, rocm-core") + set(CPACK_RPM_DEV_PACKAGE_REQUIRES "${PROJECT_NAME}, hsa-rocr-devel, rocm-core") set(CPACK_RPM_DEV_PACKAGE_PROVIDES "${PROJECT_NAME}-dev") set(CPACK_RPM_DEV_PACKAGE_OBSOLETES "${PROJECT_NAME}-dev") set(CPACK_RPM_TESTS_PACKAGE_NAME "${PROJECT_NAME}-tests") - set(CPACK_RPM_TESTS_PACKAGE_REQUIRES "${PROJECT_NAME}-devel, hsa-rocr-dev, rocm-core") + set(CPACK_RPM_TESTS_PACKAGE_REQUIRES "${PROJECT_NAME}-devel, hsa-rocr-devel, rocm-core") set(CPACK_RPM_DOCS_PACKAGE_NAME "${PROJECT_NAME}-docs") - set(CPACK_RPM_DOCS_PACKAGE_REQUIRES "${PROJECT_NAME}-devel, hsa-rocr-dev, rocm-core") + set(CPACK_RPM_DOCS_PACKAGE_REQUIRES "${PROJECT_NAME}-devel, hsa-rocr-devel, rocm-core") set(CPACK_RPM_PLUGINS_PACKAGE_NAME "${PROJECT_NAME}-plugins") - set(CPACK_RPM_PLUGINS_PACKAGE_REQUIRES "${PROJECT_NAME}, hsa-rocr-dev, rocm-core") + set(CPACK_RPM_PLUGINS_PACKAGE_REQUIRES "${PROJECT_NAME}, hsa-rocr-devel, rocm-core") set(CPACK_RPM_PACKAGE_AUTOREQ 0) set(CPACK_RPM_SAMPLES_PACKAGE_NAME "${PROJECT_NAME}-samples") set(CPACK_RPM_SAMPLES_PACKAGE_REQUIRES - "${PROJECT_NAME}-devel, hsa-rocr-dev, rocm-core, hip-runtime-amd") + "${PROJECT_NAME}-devel, hsa-rocr-devel, rocm-core, hip-runtime-amd") message("CPACK_RPM_PACKAGE_RELEASE: ${CPACK_RPM_PACKAGE_RELEASE}") # Disable build id for rocprofiler as its creating transaction error