From 6029c74e5bc31a832850abd7654eaf43417d7a68 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Fri, 19 Jul 2024 22:16:59 -0400 Subject: [PATCH] Fixing for packaging (#386) Should have been checking environment variables for package name overrides. Disabled RPM Build's AUTOREQ and AUTOPROV Signed-off-by: David Galiffi [ROCm/rocprofiler-compute commit: 98e7d0cfb3c9ac2b34c38ab05d2ad6fa3f5864d9] --- projects/rocprofiler-compute/CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/projects/rocprofiler-compute/CMakeLists.txt b/projects/rocprofiler-compute/CMakeLists.txt index dabe1fe50d..05aac3233c 100644 --- a/projects/rocprofiler-compute/CMakeLists.txt +++ b/projects/rocprofiler-compute/CMakeLists.txt @@ -424,6 +424,11 @@ set(PACKAGE_REQUIRES set(CPACK_RPM_PACKAGE_REQUIRES ${PACKAGE_REQUIRES}) set(CPACK_DEBIAN_PACKAGE_DEPENDS ${PACKAGE_REQUIRES}) +# Disable automatic dependency generation +set(CPACK_RPM_PACKAGE_AUTOREQPROV OFF) +set(CPACK_RPM_PACKAGE_AUTOREQ OFF) +set(CPACK_RPM_PACKAGE_AUTOPROV OFF) + if(INSTALL_TESTS) set(CPACK_RPM_TESTS_PACKAGE_REQUIRES ${CPACK_PACKAGE_NAME}) set(CPACK_DEBIAN_TESTS_PACKAGE_DEPENDS ${CPACK_PACKAGE_NAME}) @@ -434,14 +439,14 @@ if(DEFINED ENV{ROCM_LIBPATCH_VERSION}) set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}.$ENV{ROCM_LIBPATCH_VERSION}") endif() -if(DEFINED CPACK_RPM_PACKAGE_RELEASE) - set(CPACK_RPM_PACKAGE_RELEASE ${CPACK_RPM_PACKAGE_RELEASE}) +if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE}) + set(CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE}) else() set(CPACK_RPM_PACKAGE_RELEASE "local") endif() -if(DEFINED CPACK_DEBIAN_PACKAGE_RELEASE) - set(CPACK_DEBIAN_PACKAGE_RELEASE ${CPACK_DEBIAN_PACKAGE_RELEASE}) +if(DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE}) + set(CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE}) else() set(CPACK_DEBIAN_PACKAGE_RELEASE "local") endif()