From d629a890a1b41b9b3227d707466d4ed6f43c467c Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Mon, 14 Apr 2025 11:34:53 -0400 Subject: [PATCH] Fix RPM generation on RHEL 10 (#162) * Set version for RPM_PACKAGE_OBSOLETES * Not setting a version of omnitrace which rocprofiler-systems obsoletes will result in a warning * Patch RPATH in libunwind files * Update Timemory pointer Signed-off-by: David Galiffi --------- Signed-off-by: David Galiffi [ROCm/rocprofiler-systems commit: 75916f8876b5802815513e63973c126a6cd283ae] --- projects/rocprofiler-systems/cmake/ConfigCPack.cmake | 2 +- projects/rocprofiler-systems/external/timemory | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/rocprofiler-systems/cmake/ConfigCPack.cmake b/projects/rocprofiler-systems/cmake/ConfigCPack.cmake index 41e9d9760b..d767948375 100644 --- a/projects/rocprofiler-systems/cmake/ConfigCPack.cmake +++ b/projects/rocprofiler-systems/cmake/ConfigCPack.cmake @@ -212,7 +212,7 @@ string(REGEX REPLACE "([a-zA-Z])-([0-9])" "\\1\\2" CPACK_RPM_PACKAGE_RELEASE string(REPLACE "-" "~" CPACK_RPM_PACKAGE_RELEASE "${CPACK_RPM_PACKAGE_RELEASE}") # Handle the project rebranding from "omnitrace" to "rocprofiler-systems" -set(CPACK_RPM_PACKAGE_OBSOLETES ${OMNITRACE_PACKAGE_NAME}) +set(CPACK_RPM_PACKAGE_OBSOLETES "${OMNITRACE_PACKAGE_NAME} <= 1.13.0") set(CPACK_RPM_PACKAGE_CONFLICTS ${OMNITRACE_PACKAGE_NAME}) set(_RPM_PACKAGE_PROVIDES ${OMNITRACE_PACKAGE_NAME}) diff --git a/projects/rocprofiler-systems/external/timemory b/projects/rocprofiler-systems/external/timemory index fad254dde5..858cfc752a 160000 --- a/projects/rocprofiler-systems/external/timemory +++ b/projects/rocprofiler-systems/external/timemory @@ -1 +1 @@ -Subproject commit fad254dde56e6d6deb6f9a643000ab678726db30 +Subproject commit 858cfc752a02cc46ef03bef8ca34aaafe2609d19