From ee3f396aab99c796938664fb2d3bbdc3bf28f5e9 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Tue, 28 Feb 2017 12:02:53 +0530 Subject: [PATCH] packaging script changes for hip_hcc Change-Id: I06cce6048204315a891e3a12638a3067644cfb43 [ROCm/clr commit: 1d5ce89b1b610cebeeda69d29cc3dcf781185027] --- projects/clr/hipamd/packaging/hip_hcc.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/projects/clr/hipamd/packaging/hip_hcc.txt b/projects/clr/hipamd/packaging/hip_hcc.txt index 64c0d54caf..7dd65033fd 100644 --- a/projects/clr/hipamd/packaging/hip_hcc.txt +++ b/projects/clr/hipamd/packaging/hip_hcc.txt @@ -12,14 +12,11 @@ install(FILES @hip_SOURCE_DIR@/src/hip_hc.ll @hip_SOURCE_DIR@/src/hip_hc_gfx803. ############################# set(CPACK_SET_DESTDIR TRUE) set(CPACK_INSTALL_PREFIX "/opt/rocm/hip") +set(CPACK_PACKAGE_NAME "hip_hcc") if(@HCC_VERSION_MAJOR@ EQUAL 0) - set(CPACK_PACKAGE_NAME "hip_hcc") set(HCC_PACKAGE_NAME "hcc_lc") - set(HIP_PACKAGE_CONFLICTS "hip_hcc_exp") else() - set(CPACK_PACKAGE_NAME "hip_hcc_exp") set(HCC_PACKAGE_NAME "hcc") - set(HIP_PACKAGE_CONFLICTS "hip_hcc") endif() set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [HCC]") set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.") @@ -37,14 +34,11 @@ if(@COMPILE_HIP_ATP_MARKER@) else() set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_base (= ${CPACK_PACKAGE_VERSION}), ${HCC_PACKAGE_NAME} (= @HCC_PACKAGE_VERSION@)") endif() -set(CPACK_DEBIAN_PACKAGE_CONFLICTS ${HIP_PACKAGE_CONFLICTS}) -set(CPACK_DEBIAN_PACKAGE_REPLACES ${HIP_PACKAGE_CONFLICTS}) set(CPACK_BINARY_RPM "ON") set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64") 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_PREUN ${HIP_PACKAGE_CONFLICTS}) if(@COMPILE_HIP_ATP_MARKER@) set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${CPACK_PACKAGE_VERSION}, ${HCC_PACKAGE_NAME} = @HCC_PACKAGE_VERSION@, rocm-profiler") else()