From 4907d4577b183dd139aa7f06576233f2592b5bd6 Mon Sep 17 00:00:00 2001 From: Sean Keely Date: Wed, 21 Jul 2021 21:38:44 -0500 Subject: [PATCH] Add optional dependency on rocm-core. Part of uninstall sanity changes. Change-Id: I29f16470deb87e67050339f10bfb7cc1b5f9c1b2 --- runtime/hsa-runtime/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/runtime/hsa-runtime/CMakeLists.txt b/runtime/hsa-runtime/CMakeLists.txt index e79120745b..4f7a7a6ddc 100644 --- a/runtime/hsa-runtime/CMakeLists.txt +++ b/runtime/hsa-runtime/CMakeLists.txt @@ -416,6 +416,10 @@ set ( CPACK_DEBIAN_DEV_PACKAGE_CONTROL_EXTRA "DEBIAN/Dev/postinst;DEBIAN/Dev/pre # 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" ) +if ( ROCM_DEP_ROCMCORE ) + string ( APPEND PACK_DEBIAN_BINARY_PACKAGE_DEPENDS ", rocm-core" ) + string ( APPEND CPACK_DEBIAN_DEV_PACKAGE_DEPENDS ", rocm-core" ) +endif() set ( CPACK_DEBIAN_PACKAGE_BREAKS "hsa-ext-rocr-dev" ) set ( CPACK_DEBIAN_PACKAGE_REPLACES "hsa-ext-rocr-dev" ) @@ -445,9 +449,12 @@ set ( CPACK_RPM_DEV_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/RPM/ # 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_BINARY_PACKAGE_PROVIDES "hsa-ext-rocr-dev" ) set ( CPACK_RPM_DEV_PACKAGE_REQUIRES "hsa-rocr" ) -set ( CPACK_RPM_DEV_PACKAGE_PROVIDES "hsa-ext-rocr-dev hsa-rocr-dev" ) +if ( ROCM_DEP_ROCMCORE ) + string ( APPEND CPACK_RPM_BINARY_PACKAGE_REQUIRES " rocm-core" ) + string ( APPEND CPACK_RPM_DEV_PACKAGE_REQUIRES " rocm-core" ) +endif() +set ( CPACK_RPM_PACKAGE_PROVIDES "hsa-ext-rocr-dev hsa-rocr-dev" ) set ( CPACK_RPM_PACKAGE_OBSOLETES "hsa-ext-rocr-dev" ) ## Include packaging