From dd0c2582c55f3bebd4359c692bc5c7697df754d5 Mon Sep 17 00:00:00 2001 From: Jason Tang Date: Mon, 29 Jun 2020 12:27:28 -0400 Subject: [PATCH] SWDEV-242879 - Not to use fixnames Change-Id: I3d0e2f3fe6c773e020c8bf8cdfd75fd565d61505 [ROCm/hip commit: e29b828b7cc1e2abe8adf6f588b5286f0daa28b4] --- projects/hip/CMakeLists.txt | 7 +------ projects/hip/packaging/hip-base.txt | 4 ++++ projects/hip/packaging/hip-doc.txt | 4 ++++ projects/hip/packaging/hip-nvcc.txt | 4 ++++ projects/hip/packaging/hip-rocclr.txt | 4 ++++ projects/hip/packaging/hip-samples.txt | 4 ++++ 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/projects/hip/CMakeLists.txt b/projects/hip/CMakeLists.txt index c62ec8d85d..6e09141e68 100755 --- a/projects/hip/CMakeLists.txt +++ b/projects/hip/CMakeLists.txt @@ -626,18 +626,13 @@ if(POLICY CMP0037) cmake_policy(PUSH) cmake_policy(SET CMP0037 OLD) endif() -file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/fixnames - CONTENT "pwd; for i in *.deb; do mv \"\$i\" \"\${i/.deb/-amd64.deb}\" ; done -for i in *.rpm ; do mv \$i \${i/.rpm/.x86_64.rpm} ; done -") + if(HIP_PLATFORM STREQUAL "hcc") add_custom_target(package - COMMAND bash ${PROJECT_BINARY_DIR}/fixnames WORKING_DIRECTORY ${PROJECT_BINARY_DIR} DEPENDS pkg_hip_base pkg_hip_hcc pkg_hip_nvcc pkg_hip_doc pkg_hip_samples) elseif(HIP_PLATFORM STREQUAL "rocclr") add_custom_target(package - COMMAND bash ${PROJECT_BINARY_DIR}/fixnames WORKING_DIRECTORY ${PROJECT_BINARY_DIR} DEPENDS pkg_hip_base hip_on_rocclr pkg_hip_nvcc pkg_hip_doc pkg_hip_samples) endif() diff --git a/projects/hip/packaging/hip-base.txt b/projects/hip/packaging/hip-base.txt index 6a5147c292..7ba7d3b93a 100644 --- a/projects/hip/packaging/hip-base.txt +++ b/projects/hip/packaging/hip-base.txt @@ -27,12 +27,16 @@ set(CPACK_PACKAGE_VERSION_MINOR @HIP_VERSION_MINOR@) 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_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}_amd64.deb) set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm") set(CPACK_DEBIAN_PACKAGE_DEPENDS "perl (>= 5.0),libfile-which-perl") set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-base") set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_base") + set(CPACK_BINARY_RPM "ON") +set(CPACK_RPM_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}.x86_64.rpm) 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") diff --git a/projects/hip/packaging/hip-doc.txt b/projects/hip/packaging/hip-doc.txt index 41db246d31..911f2486fd 100644 --- a/projects/hip/packaging/hip-doc.txt +++ b/projects/hip/packaging/hip-doc.txt @@ -30,11 +30,15 @@ set(CPACK_PACKAGE_VERSION_MINOR @HIP_VERSION_MINOR@) 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_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}_amd64.deb) set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION})") set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-doc") set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_doc") + set(CPACK_BINARY_RPM "ON") +set(CPACK_RPM_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}.x86_64.rpm) set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) diff --git a/projects/hip/packaging/hip-nvcc.txt b/projects/hip/packaging/hip-nvcc.txt index 4b11939609..5d3d91ffb6 100644 --- a/projects/hip/packaging/hip-nvcc.txt +++ b/projects/hip/packaging/hip-nvcc.txt @@ -16,12 +16,16 @@ set(CPACK_PACKAGE_VERSION_MINOR @HIP_VERSION_MINOR@) 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_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}_amd64.deb) set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm") set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}), cuda (>= 7.5)") set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-nvcc") set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_nvcc") + set(CPACK_BINARY_RPM "ON") +set(CPACK_RPM_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}.x86_64.rpm) 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") diff --git a/projects/hip/packaging/hip-rocclr.txt b/projects/hip/packaging/hip-rocclr.txt index 0e185bd69e..e3260e8365 100644 --- a/projects/hip/packaging/hip-rocclr.txt +++ b/projects/hip/packaging/hip-rocclr.txt @@ -38,11 +38,15 @@ set(CPACK_PACKAGE_VERSION_MINOR @HIP_VERSION_MINOR@) 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_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}_amd64.deb) set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm") set(CPACK_DEBIAN_PACKAGE_DEPENDS "hsa-rocr-dev, rocm-utils, hip-base (= ${CPACK_PACKAGE_VERSION}), comgr (>= 1.1), llvm-amdgpu") set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-hcc (= ${CPACK_PACKAGE_VERSION})") + set(CPACK_BINARY_RPM "ON") +set(CPACK_RPM_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}.x86_64.rpm) 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") diff --git a/projects/hip/packaging/hip-samples.txt b/projects/hip/packaging/hip-samples.txt index 6f643c3865..6481cf7bde 100644 --- a/projects/hip/packaging/hip-samples.txt +++ b/projects/hip/packaging/hip-samples.txt @@ -18,11 +18,15 @@ set(CPACK_PACKAGE_VERSION_MINOR @HIP_VERSION_MINOR@) 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_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}_amd64.deb) set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION})") set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-samples") set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_samples") + set(CPACK_BINARY_RPM "ON") +set(CPACK_RPM_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}.x86_64.rpm) set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION})