From fc5d8d10763cb5a9e4c056fe0c5fbb94aae1f1a8 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Fri, 4 Nov 2022 17:31:08 -0400 Subject: [PATCH] Rework libdrm requires/recommends To be more alligned with ROCr, libdrm dev package appears to be required, but we don't care if it's ours or the distro's. So require either but recommend our package to get the latest version. Change-Id: I744ce4861644a83ba94c39e0bf4230eab58cc68a Signed-off-by: Jeremy Newton [ROCm/ROCR-Runtime commit: 4fa9404fe2e783578bbf02dc22cb2aebf792469a] --- projects/rocr-runtime/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/rocr-runtime/CMakeLists.txt b/projects/rocr-runtime/CMakeLists.txt index d00248ee83..32ce214514 100644 --- a/projects/rocr-runtime/CMakeLists.txt +++ b/projects/rocr-runtime/CMakeLists.txt @@ -358,19 +358,20 @@ if ( PROC_RESULT EQUAL "0" AND NOT EVAL_RESULT STREQUAL "" ) endif() # Setting devel package dependendent version -set(CPACK_DEBIAN_PACKAGE_DEPENDS "libdrm-dev, rocm-core") -set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libdrm-amdgpu-amdgpu1") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "libdrm-amdgpu-dev | libdrm-dev, rocm-core") +set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libdrm-amdgpu-dev") set(CPACK_DEBIAN_PACKAGE_REPLACES "hsakmt-roct") -set(CPACK_RPM_PACKAGE_REQUIRES "libdrm-devel, rocm-core") +set(CPACK_RPM_PACKAGE_REQUIRES "rocm-core") # NOTE: CentOS/RHEL <8 and SUSE <10 do not have support for rpm recommends, # so HSAKMT_REQUIRES_LIBDRM should be defined when building EL7 to avoid # producing binaries which do not install on CentOS7 or RHEL7 if(HSAKMT_REQUIRES_LIBDRM) - string ( APPEND CPACK_RPM_PACKAGE_REQUIRES ", libdrm-amdgpu" ) + string ( APPEND CPACK_RPM_PACKAGE_REQUIRES ", libdrm-amdgpu-devel" ) else() - set(CPACK_RPM_PACKAGE_RECOMMENDS "libdrm-amdgpu" ) + string ( APPEND CPACK_RPM_PACKAGE_REQUIRES ", (libdrm-amdgpu-devel or libdrm-devel)" ) + set(CPACK_RPM_PACKAGE_RECOMMENDS "libdrm-amdgpu-devel" ) endif() # Set the names now using CPACK utility