diff --git a/runtime/hsa-runtime/CMakeLists.txt b/runtime/hsa-runtime/CMakeLists.txt index 3f5dd4bed8..20d6d43450 100644 --- a/runtime/hsa-runtime/CMakeLists.txt +++ b/runtime/hsa-runtime/CMakeLists.txt @@ -408,17 +408,20 @@ configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/Binary/postinst.in DEBIAN/Bi configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/DEBIAN/Binary/prerm.in DEBIAN/Binary/prerm @ONLY ) set ( CPACK_DEBIAN_BINARY_PACKAGE_CONTROL_EXTRA "DEBIAN/Binary/postinst;DEBIAN/Binary/prerm" ) -# Declare package relationships (hsa-ext-rocr-dev is a legacy package that we subsume) -set ( CPACK_DEBIAN_BINARY_PACKAGE_DEPENDS "hsakmt-roct" ) -set ( CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "hsa-rocr" ) +# package dependencies +set( CPACK_DEBIAN_BINARY_PACKAGE_DEPENDS "libdrm-amdgpu-amdgpu1 | libdrm-amdgpu1, libnuma1") +set( CPACK_DEBIAN_BINARY_PACKAGE_RECOMMENDS "libdrm-amdgpu-amdgpu1") +set ( CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "hsa-rocr, hsakmt-roct-dev" ) if ( ROCM_DEP_ROCMCORE ) string ( APPEND CPACK_DEBIAN_BINARY_PACKAGE_DEPENDS ", rocm-core" ) - string ( APPEND CPACK_DEBIAN_DEV_PACKAGE_DEPENDS ", rocm-core" ) endif() +# Declare package relationships (hsa-ext-rocr-dev is a legacy package that we subsume) set ( CPACK_DEBIAN_PACKAGE_BREAKS "hsa-ext-rocr-dev" ) set ( CPACK_DEBIAN_PACKAGE_REPLACES "hsa-ext-rocr-dev" ) # RPM package specific variables +set ( EL7_DISTRO "FALSE" ) +checksetel7(EL7_DISTRO) set ( CPACK_RPM_BINARY_PACKAGE_NAME "hsa-rocr" ) set ( CPACK_RPM_DEV_PACKAGE_NAME "hsa-rocr-devel" ) if ( DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE} ) @@ -438,13 +441,18 @@ configure_file ( "${CMAKE_CURRENT_SOURCE_DIR}/RPM/Binary/postun.in" RPM/Binary/p set ( CPACK_RPM_BINARY_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/RPM/Binary/post" ) set ( CPACK_RPM_BINARY_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/RPM/Binary/postun" ) -# Declare package relationships (hsa-ext-rocr-dev is a legacy package that we subsume) -set ( CPACK_RPM_BINARY_PACKAGE_REQUIRES "hsakmt-roct" ) -set ( CPACK_RPM_DEV_PACKAGE_REQUIRES "hsa-rocr" ) +# package dependencies +if (${EL7_DISTRO} STREQUAL "TRUE") + set ( CPACK_RPM_BINARY_PACKAGE_REQUIRES "libdrm-amdgpu, numactl-libs" ) +else() + set ( CPACK_RPM_BINARY_PACKAGE_REQUIRES "(libdrm-amdgpu or libdrm or libdrm_amdgpu1), (libnuma1 or numactl-libs)" ) + set ( CPACK_RPM_BINARY_PACKAGE_SUGGESTS "libdrm-amdgpu" ) +endif() +set ( CPACK_RPM_DEV_PACKAGE_REQUIRES "hsa-rocr , hsakmt-roct-devel" ) if ( ROCM_DEP_ROCMCORE ) string ( APPEND CPACK_RPM_BINARY_PACKAGE_REQUIRES " rocm-core" ) - string ( APPEND CPACK_RPM_DEV_PACKAGE_REQUIRES " rocm-core" ) endif() +# Declare package relationships (hsa-ext-rocr-dev is a legacy package that we subsume) set ( CPACK_RPM_PACKAGE_PROVIDES "hsa-ext-rocr-dev hsa-rocr-dev" ) set ( CPACK_RPM_PACKAGE_OBSOLETES "hsa-ext-rocr-dev" ) diff --git a/runtime/hsa-runtime/cmake_modules/utils.cmake b/runtime/hsa-runtime/cmake_modules/utils.cmake index 4954514a61..627f0b26c7 100644 --- a/runtime/hsa-runtime/cmake_modules/utils.cmake +++ b/runtime/hsa-runtime/cmake_modules/utils.cmake @@ -217,3 +217,17 @@ function ( listsubdirs DIRPATH SUBDIRECTORIES ) endforeach() set (${SUBDIRECTORIES} ${FOLDERS} PARENT_SCOPE) endfunction() + +## Sets el7 flag to be true +function ( Checksetel7 EL7_DISTRO ) +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 NOT EVAL_RESULT STREQUAL "") + if( "${EVAL_RESULT}" STREQUAL ".el7") + set (${EL7_DISTRO} TRUE PARENT_SCOPE) + endif() +endif() +endfunction()