From d91e1d9daa6ba65d3e6a361c2566240ecf369e30 Mon Sep 17 00:00:00 2001 From: Icarus Sparry Date: Wed, 7 Jul 2021 15:07:40 +0000 Subject: [PATCH] SWDEV-293197 - Add dependency on rocm-core Signed-off-by: Icarus Sparry Change-Id: Id1b34c7c6fa551f3aacc35827cb6906cec4484e3 --- opencl/packaging/rocm-opencl-dev.txt | 9 +++++++-- opencl/packaging/rocm-opencl.txt | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/opencl/packaging/rocm-opencl-dev.txt b/opencl/packaging/rocm-opencl-dev.txt index 2d6b40cfcb..dd58f6a1ba 100644 --- a/opencl/packaging/rocm-opencl-dev.txt +++ b/opencl/packaging/rocm-opencl-dev.txt @@ -35,7 +35,7 @@ else() endif() message("Using CPACK_DEBIAN_PACKAGE_RELEASE ${CPACK_DEBIAN_PACKAGE_RELEASE}") set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "mesa-common-dev, rocm-opencl") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "mesa-common-dev, rocm-opencl, rocm-core") # RPM CPACK variables set(CPACK_BINARY_RPM "ON") @@ -59,6 +59,11 @@ if(PROC_RESULT EQUAL "0" AND NOT EVAL_RESULT STREQUAL "") endif() set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") -set(CPACK_RPM_PACKAGE_REQUIRES "rocm-opencl") +set(CPACK_RPM_PACKAGE_REQUIRES "rocm-opencl, rocm-core") +# Remove dependency on rocm-core if -DROCM_DEP_ROCMCORE=ON not given to cmake +if(NOT ROCM_DEP_ROCMCORE) + string(REGEX REPLACE ",? ?rocm-core" "" CPACK_RPM_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES}) + string(REGEX REPLACE ",? ?rocm-core" "" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS}) +endif() include(CPack) diff --git a/opencl/packaging/rocm-opencl.txt b/opencl/packaging/rocm-opencl.txt index 9f253cdbe8..04ed994a7f 100644 --- a/opencl/packaging/rocm-opencl.txt +++ b/opencl/packaging/rocm-opencl.txt @@ -34,7 +34,7 @@ endif() message("Using CPACK_DEBIAN_PACKAGE_RELEASE ${CPACK_DEBIAN_PACKAGE_RELEASE}") set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT") set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "libelf-dev, comgr, hsa-rocr-dev") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "libelf-dev, comgr, hsa-rocr-dev, rocm-core") # RPM CPACK variables set(CPACK_BINARY_RPM "ON") @@ -59,6 +59,11 @@ set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/rpm_post") set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/rpm_postun") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") -set(CPACK_RPM_PACKAGE_REQUIRES "comgr, hsa-rocr-dev") +set(CPACK_RPM_PACKAGE_REQUIRES "comgr, hsa-rocr-dev, rocm-core") +# Remove dependency on rocm-core if -DROCM_DEP_ROCMCORE=ON not given to cmake +if(NOT ROCM_DEP_ROCMCORE) + string(REGEX REPLACE ",? ?rocm-core" "" CPACK_RPM_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES}) + string(REGEX REPLACE ",? ?rocm-core" "" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS}) +endif() include(CPack)