From b99bf7f3b617b4bb84016535b204c8a2b85854e9 Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Sun, 22 Jan 2023 23:54:22 -0800 Subject: [PATCH] Added OS details to kfdtest rpm packge name Change-Id: I600e094c364e1c7219ae3db12f0c4e1f7598c132 [ROCm/ROCR-Runtime commit: bc40579f96ece6a0015713d20ad3577429888d88] --- projects/rocr-runtime/tests/kfdtest/CMakeLists.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/projects/rocr-runtime/tests/kfdtest/CMakeLists.txt b/projects/rocr-runtime/tests/kfdtest/CMakeLists.txt index e56643d3d7..ba1d99be51 100644 --- a/projects/rocr-runtime/tests/kfdtest/CMakeLists.txt +++ b/projects/rocr-runtime/tests/kfdtest/CMakeLists.txt @@ -59,6 +59,19 @@ if( DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE} ) set ( CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE} ) endif() +## Note: rpm --eval %{?dist} will evaluate to NULL in Debian +## So Debian distros won't append dist tag to CPACK_RPM_PACKAGE_RELEASE. +## Also for debian package name , the dist tag is added from build env +execute_process( COMMAND rpm --eval %{?dist} + RESULT_VARIABLE PROC_RESULT + OUTPUT_VARIABLE EVAL_RESULT + OUTPUT_STRIP_TRAILING_WHITESPACE ) +message("RESULT_VARIABLE ${PROC_RESULT} OUTPUT_VARIABLE: ${EVAL_RESULT}") +## Add distribution tag to rpm package name +if ( PROC_RESULT EQUAL "0" AND NOT EVAL_RESULT STREQUAL "" ) + string ( APPEND CPACK_RPM_PACKAGE_RELEASE "%{?dist}" ) +endif() + set(PACKAGE_VERSION_STR "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}.${ROCM_VERSION_FOR_PACKAGE}") set(CPACK_PACKAGE_VERSION "${PACKAGE_VERSION_STR}")