From 2ddf2f8f82ee1e2bde04df0f7653e70ef1f08bbd Mon Sep 17 00:00:00 2001 From: Sean Keely Date: Wed, 21 Jul 2021 22:46:12 -0500 Subject: [PATCH] Simplify RPM package building. The need to run rpm outside of cpack seems to have passed. Change-Id: I8d7d992e289a0a88fa11b57bf0401bc6740c266b [ROCm/ROCR-Runtime commit: 471c1859ab5f4bf3d096d02d63c704534967b45b] --- projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt index 2a8937ce58..e79120745b 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt +++ b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt @@ -428,13 +428,7 @@ else() set ( CPACK_RPM_PACKAGE_RELEASE "local" ) endif() -execute_process( COMMAND rpm --eval %{?dist} - RESULT_VARIABLE PROC_RESULT - OUTPUT_VARIABLE EVAL_RESULT - OUTPUT_STRIP_TRAILING_WHITESPACE ) -if ( PROC_RESULT EQUAL "0" AND NOT EVAL_RESULT STREQUAL "" ) - string ( APPEND CPACK_RPM_PACKAGE_RELEASE "%{?dist}" ) -endif() +string ( APPEND CPACK_RPM_PACKAGE_RELEASE "%{?dist}" ) set ( CPACK_RPM_FILE_NAME "RPM-DEFAULT" ) message("CPACK_RPM_PACKAGE_RELEASE: ${CPACK_RPM_PACKAGE_RELEASE}")