From 9d12fb8e25b13d35d282f414d38b6dd2830cbb85 Mon Sep 17 00:00:00 2001 From: Aaron Enye Shi Date: Thu, 13 Feb 2020 10:02:49 -0500 Subject: [PATCH] HIP-VDI fix CPACK packaging dependencies Change-Id: I64d803499dd8b2fc80b1320f71115ebaf019a9e7 [ROCm/hip commit: 85b6905871039fa2d7e430375c4b94c3e976bcc5] --- projects/hip/packaging/hip-base.txt | 4 ++-- projects/hip/packaging/hip-samples.txt | 4 ++-- projects/hip/packaging/hip-vdi.txt | 14 ++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/projects/hip/packaging/hip-base.txt b/projects/hip/packaging/hip-base.txt index 221ff98608..4ff936dba4 100644 --- a/projects/hip/packaging/hip-base.txt +++ b/projects/hip/packaging/hip-base.txt @@ -25,7 +25,7 @@ set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR} set(CPACK_GENERATOR "TGZ;DEB;RPM") set(CPACK_BINARY_DEB "ON") set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "perl (>= 5.0)") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "perl (>= 5.0), llvm-amdgpu") set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip_base") set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_base") set(CPACK_DEBIAN_PACKAGE_CONFLICTS "hip_base") @@ -34,7 +34,7 @@ set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst") set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/prerm") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") -set(CPACK_RPM_PACKAGE_REQUIRES "perl >= 5.0") +set(CPACK_RPM_PACKAGE_REQUIRES "perl >= 5.0, llvm-amdgpu") set(CPACK_RPM_PACKAGE_OBSOLETES "hip_base") set(CPACK_RPM_PACKAGE_CONFLICTS "hip_base") set(CPACK_BINARY_RPM "ON") diff --git a/projects/hip/packaging/hip-samples.txt b/projects/hip/packaging/hip-samples.txt index aa8ff42821..737f048d8f 100644 --- a/projects/hip/packaging/hip-samples.txt +++ b/projects/hip/packaging/hip-samples.txt @@ -19,7 +19,7 @@ set(CPACK_PACKAGE_VERSION_PATCH @HIP_VERSION_PATCH@) set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) set(CPACK_GENERATOR "TGZ;DEB;RPM") set(CPACK_BINARY_DEB "ON") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION})") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-vdi (= ${CPACK_PACKAGE_VERSION})") set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip_samples") set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_samples") set(CPACK_DEBIAN_PACKAGE_CONFLICTS "hip_samples") @@ -27,7 +27,7 @@ set(CPACK_BINARY_RPM "ON") set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) -set(CPACK_RPM_PACKAGE_REQUIRES "hip-base = ${HIP_BASE_VERSION}") +set(CPACK_RPM_PACKAGE_REQUIRES "hip-vdi = ${HIP_BASE_VERSION}") set(CPACK_RPM_PACKAGE_OBSOLETES "hip_samples") set(CPACK_RPM_PACKAGE_CONFLICTS "hip_samples") set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") diff --git a/projects/hip/packaging/hip-vdi.txt b/projects/hip/packaging/hip-vdi.txt index 9290d1bc2c..48d0a61791 100644 --- a/projects/hip/packaging/hip-vdi.txt +++ b/projects/hip/packaging/hip-vdi.txt @@ -29,13 +29,11 @@ set(CPACK_GENERATOR "TGZ;DEB;RPM") set(CPACK_BINARY_DEB "ON") set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm") if(@COMPILE_HIP_ATP_MARKER@) - #set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}), ${HCC_PACKAGE_NAME} (= @HCC_PACKAGE_VERSION@), rocm-profiler, comgr (>= 1.1)") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}), rocm-profiler, comgr (>= 1.1)") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "hsa-rocr-dev, hsa-ext-rocr-dev, rocm-utils, hip-base (= ${CPACK_PACKAGE_VERSION}), rocm-profiler, comgr (>= 1.1)") else() - #set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}), ${HCC_PACKAGE_NAME} (= @HCC_PACKAGE_VERSION@), comgr (>= 1.1)") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}), comgr (>= 1.1)") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "hsa-rocr-dev, hsa-ext-rocr-dev, rocm-utils, hip-base (= ${CPACK_PACKAGE_VERSION}), comgr (>= 1.1)") endif() -set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip_vdi") +set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip_vdi, hip-hcc (= ${CPACK_PACKAGE_VERSION})") set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_vdi") set(CPACK_DEBIAN_PACKAGE_CONFLICTS "hip_vdi") set(CPACK_BINARY_RPM "ON") @@ -45,11 +43,11 @@ set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/prerm") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) if(@COMPILE_HIP_ATP_MARKER@) - set(CPACK_RPM_PACKAGE_REQUIRES "hip-base = ${HIP_BASE_VERSION}, rocm-profiler, comgr >= 1.1") - #set(CPACK_RPM_PACKAGE_REQUIRES "hip-base = ${HIP_BASE_VERSION}, ${HCC_PACKAGE_NAME} = @HCC_PACKAGE_VERSION@, rocm-profiler, comgr >= 1.1") + set(CPACK_RPM_PACKAGE_REQUIRES "hsa-rocr-dev, hsa-ext-rocr-dev, rocm-utils, hip-base = ${HIP_BASE_VERSION}, rocm-profiler, comgr >= 1.1") else() - set(CPACK_RPM_PACKAGE_REQUIRES "hip-base = ${HIP_BASE_VERSION}, comgr >= 1.1") + set(CPACK_RPM_PACKAGE_REQUIRES "hsa-rocr-dev, hsa-ext-rocr-dev, rocm-utils, hip-base = ${HIP_BASE_VERSION}, comgr >= 1.1") endif() +set(CPACK_RPM_PACKAGE_PROVIDES "hip_vdi, hip-hcc = ${HIP_BASE_VERSION}") set(CPACK_RPM_PACKAGE_OBSOLETES "hip_vdi") set(CPACK_RPM_PACKAGE_CONFLICTS "hip_vdi") set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt")