From 3d124359f1d3e1872cae22e55ac3c9d16216a893 Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Wed, 1 May 2024 15:34:56 -0700 Subject: [PATCH] SWDEV-451078 - Update rocminfo package dependency list python3, glibc, libgcc/libgcc_s1, libstdc++/libstdc++6 added to the RPM package dependency list python3, libc6, libgcc-s1, libstdc++6 added to the DEB package dependency list Change-Id: I4843b1431c0d0edf1b0df1e12c82adb4ff53c8cd [ROCm/rocminfo commit: 1f4752295e1e2d5e9eb814a3df1208cf40ba1262] --- projects/rocminfo/CMakeLists.txt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/projects/rocminfo/CMakeLists.txt b/projects/rocminfo/CMakeLists.txt index a55c8164ee..ff240bf387 100755 --- a/projects/rocminfo/CMakeLists.txt +++ b/projects/rocminfo/CMakeLists.txt @@ -210,7 +210,7 @@ if(DEFINED ENV{ROCM_LIBPATCH_VERSION}) endif() #Debian package specific variables -set(CPACK_DEBIAN_PACKAGE_DEPENDS "hsa-rocr, kmod, pciutils") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "hsa-rocr, kmod, pciutils, python3, libc6, libgcc-s1, libstdc++6") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_DEBIAN_PACKAGE_HOMEPAGE} CACHE STRING "https://github.com/RadeonOpenCompute/ROCm") if (DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE}) set(CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE}) @@ -222,7 +222,20 @@ if ( ROCM_DEP_ROCMCORE ) endif() #RPM package specific variables -set(CPACK_RPM_PACKAGE_REQUIRES "hsa-rocr kmod pciutils") +execute_process(COMMAND rpm --eval %{?dist} + RESULT_VARIABLE PROC_RESULT + OUTPUT_VARIABLE EVAL_RESULT + OUTPUT_STRIP_TRAILING_WHITESPACE) +message("RESULT_VARIABLE ${PROC_RESULT} OUTPUT_VARIABLE: ${EVAL_RESULT}") + +if(PROC_RESULT EQUAL "0" AND "${EVAL_RESULT}" STREQUAL ".el7") + # In Centos using parentheses is causing cpack errors. + # Set the dependencies specifically for centos + set(CPACK_RPM_PACKAGE_REQUIRES "hsa-rocr, kmod, pciutils, python3, glibc, libgcc, libstdc++") +else() + set(CPACK_RPM_PACKAGE_REQUIRES "hsa-rocr, kmod, pciutils, python3, glibc, (libgcc or libgcc_s1), (libstdc++ or libstdc++6)") +endif() # End EVAL_RESULT + if(DEFINED CPACK_PACKAGING_INSTALL_PREFIX) set ( CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" ) endif()