diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt index f0c6d7f918..b9f90e315e 100755 --- a/projects/clr/hipamd/CMakeLists.txt +++ b/projects/clr/hipamd/CMakeLists.txt @@ -181,6 +181,23 @@ if ( PROC_RESULT EQUAL "0" AND NOT EVAL_RESULT STREQUAL "" ) endif() message(STATUS "CPACK_RPM_PACKAGE_RELEASE: ${CPACK_RPM_PACKAGE_RELEASE}") +set (DEB10_DISTRO "FALSE") +execute_process( COMMAND sh "-c" "cat /etc/os-release | grep \"^NAME=\"" + RESULT_VARIABLE PROC_RESULT_NAME + OUTPUT_VARIABLE OS_NAME_RESULT + OUTPUT_STRIP_TRAILING_WHITESPACE ) +execute_process( COMMAND sh "-c" "cat /etc/os-release | grep \"^VERSION_ID=\"" + RESULT_VARIABLE PROC_RESULT_VERSION + OUTPUT_VARIABLE OS_VERSION_ID_RESULT + OUTPUT_STRIP_TRAILING_WHITESPACE ) + +if ( PROC_RESULT_NAME EQUAL "0" AND NOT OS_NAME_RESULT STREQUAL "" AND + PROC_RESULT_VERSION EQUAL "0" AND NOT OS_VERSION_ID_RESULT STREQUAL "") + if ( "${OS_NAME_RESULT}" STREQUAL "NAME=\"Debian GNU/Linux\"" AND "${OS_VERSION_ID_RESULT}" STREQUAL "VERSION_ID=\"10\"") + set ( DEB10_DISTRO "TRUE" ) + endif() +endif() + add_to_config(_versionInfo HIP_PACKAGING_VERSION_PATCH) add_to_config(_versionInfo CPACK_DEBIAN_PACKAGE_RELEASE) add_to_config(_versionInfo CPACK_RPM_PACKAGE_RELEASE) diff --git a/projects/clr/hipamd/packaging/CMakeLists.txt b/projects/clr/hipamd/packaging/CMakeLists.txt index d8be518977..5ccc92b0c8 100644 --- a/projects/clr/hipamd/packaging/CMakeLists.txt +++ b/projects/clr/hipamd/packaging/CMakeLists.txt @@ -210,12 +210,19 @@ if(FILE_REORG_BACKWARD_COMPATIBILITY) set(CPACK_RPM_BINARY_PRE_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/binary/prerm") endif() string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) + if(EL7_DISTRO) # centos: In centos using parenthesis is causing error. So set the specific dependencies set(HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES "glibc, numactl-libs, libstdc++, libgcc") else() # RHEL/SLES - set(HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES "glibc, (numactl-libs or libnuma1), (libstdc++ or libstdc++6), (libgcc or libgcc_s1)") + set(HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES "glibc, (numactl-libs or libnuma1), (libstdc++ or libstdc++6)") + if(DEB10_DISTRO) + # On Debian Buster only: libgcc_s.so.1 is in the package libgcc1 + set(HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES "${HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES}, libgcc1") + else() + set(HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES "${HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES}, (libgcc or libgcc_s1)" ) + endif() endif() set(CPACK_RPM_BINARY_PACKAGE_REQUIRES "${HIP_RUNTIME_ROCM_PKG_DEPENDENCIES}, ${HIP_RUNTIME_RPM_STDPKG_DEPENDENCIES}")