From d32ff28ebfdd3f7af75e16b9bb455561651015c7 Mon Sep 17 00:00:00 2001 From: "Ramakrishnan, Ranjith" Date: Tue, 20 May 2025 14:41:38 -0700 Subject: [PATCH] SWDEV-532478 - Add rocm-core dependency to RPM packages (#67) rocm-core dependency was missing for rpm packages and fixed the same --- CMakeLists.txt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7922a7a86..769481adf4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -203,16 +203,15 @@ set(CPACK_RPM_COMPONENT_INSTALL ON) # python doesn't need to be asan set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6, python3") set(CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}") -# Only add dependency on rocm-core if -DROCM_DEP_ROCMCORE=ON is given -if(ROCM_DEP_ROCMCORE) - set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, rocm-core") - # rocm-core needs to be asan - # override original variable because CPACK_DEBIAN_PACKAGE_DEPENDS changed - set(CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}-asan") -endif() -# carefully reuse DEB's "DEPENDS" for RPM's "REQUIRES" set(CPACK_RPM_PACKAGE_REQUIRES "python3") set(CPACK_RPM_ASAN_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}") +# Only add dependency on rocm-core if -DROCM_DEP_ROCMCORE=ON is given +if(ROCM_DEP_ROCMCORE) + string(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ", rocm-core") + string(APPEND CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS ", rocm-core-asan") + string(APPEND CPACK_RPM_PACKAGE_REQUIRES ", rocm-core") + string(APPEND CPACK_RPM_ASAN_PACKAGE_REQUIRES ", rocm-core-asan") +endif() #Component Specific Configuration/Flags set(CPACK_DEBIAN_DEV_PACKAGE_NAME ${ROCM_SMI_PACKAGE})