From 58d9a05f9530998bfbd94f3ac2b1a7ee267a5d67 Mon Sep 17 00:00:00 2001
From: Nirmal Unnikrishnan <nirmal.unnikrishnan@amd.com>
Date: Tue, 10 Sep 2024 15:29:28 -0500
Subject: [PATCH] SWDEV-484091 : Correcting LIB_PATCH_VERSION

ROCM_LIBPATCH_VERSION will be set in ENV and should be using that for setting library patch version. Fixing the bug as the patch version was not taken from ENV

Change-Id: I020e48ce5169c17b916be99311623198da1cabf7
---
 CMakeLists.txt | 16 +++++++++++++---
 utils.cmake    | 17 ++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index baa7e47d39..afb0f752fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,13 @@ if( NOT DEFINED BUILD_ID )
   set( BUILD_ID "9999")
 endif()
 
-set( PACKAGE_BUILD_INFO "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_COMMIT_COUNT}-${BUILD_ID}-${VERSION_HASH}" )
+#Add the libpatch version if available
+if( DEFINED VERSION_POINT )
+  set( PACKAGE_BUILD_INFO "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_POINT}.${VERSION_COMMIT_COUNT}-${BUILD_ID}-${VERSION_HASH}" )
+  message ( STATUS "PACKAGE_BUILD_INFO ${PACKAGE_BUILD_INFO}" )
+else ()
+  set( PACKAGE_BUILD_INFO "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_COMMIT_COUNT}-${BUILD_ID}-${VERSION_HASH}" )
+endif()
 
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/rocmmod.in ${BUILD_DIR}/rocmmod @ONLY )
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/rocm-core.postinst ${BUILD_DIR}/postinst @ONLY )
@@ -130,8 +136,12 @@ else()
   endif()
 endif()
 
-#intallation directive
-file ( WRITE "${CMAKE_CURRENT_BINARY_DIR}/version" "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${BUILD_ID}\n" )
+#Add the libpatch version if available to the version file
+if( DEFINED VERSION_POINT )
+  file ( WRITE "${CMAKE_CURRENT_BINARY_DIR}/version" "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_POINT}-${BUILD_ID}\n" )
+else()
+  file ( WRITE "${CMAKE_CURRENT_BINARY_DIR}/version" "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${BUILD_ID}\n" )
+endif()
 
 ## Support for Static and Shared Target Packaging
 if(BUILD_SHARED_LIBS)
diff --git a/utils.cmake b/utils.cmake
index 3b48f05bca..f9fb2fd319 100644
--- a/utils.cmake
+++ b/utils.cmake
@@ -57,6 +57,12 @@ function( parse_rocm_version VERSION_STRING )
         set ( TEMP_VERSION_STRING "${TEMP_VERSION_STRING}.${PATCH}" )
     endif ()
 
+    if ( ${VERSION_COUNT} GREATER 3 )
+        list ( GET VERSIONS 3 POINT )
+        set ( VERSION_POINT ${POINT} PARENT_SCOPE )
+        set ( TEMP_VERSION_STRING "${TEMP_VERSION_STRING}.${POINT}" )
+    endif ()
+
     if ( DEFINED VERSION_BUILD )
         set ( VERSION_BUILD "${VERSION_BUILD}" PARENT_SCOPE )
     endif ()
@@ -113,7 +119,7 @@ function( set_variables )
     endif()
 
     #set libpatch version
-    if(NOT DEFINED ROCM_LIBPATCH_VERSION)
+    if(NOT DEFINED ENV{ROCM_LIBPATCH_VERSION})
       set(ROCM_LIBPATCH_VERSION "${VERSION_MAJOR}")
       string(LENGTH ${VERSION_MINOR} LENSTR)
       if(LENSTR EQUAL 1) # length of version cannot be zero hence it would be 1 or greater
@@ -130,15 +136,17 @@ function( set_variables )
       endif()
 
       set(ROCM_LIBPATCH_VERSION "${ROCM_LIBPATCH_VERSION}" PARENT_SCOPE )
+    else()
+      set (ROCM_LIBPATCH_VERSION $ENV{ROCM_LIBPATCH_VERSION} PARENT_SCOPE )
     endif()
 
-    if ( DEFINED CPACK_RPM_PACKAGE_RELEASE )
+    if ( DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE} )
       set ( CPACK_RPM_PACKAGE_RELEASE ${CPACK_RPM_PACKAGE_RELEASE} PARENT_SCOPE )
     else()
       set ( CPACK_RPM_PACKAGE_RELEASE "local" PARENT_SCOPE )
     endif()
 
-    if ( DEFINED CPACK_DEBIAN_PACKAGE_RELEASE )
+    if ( DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE} )
       set ( CPACK_DEBIAN_PACKAGE_RELEASE ${CPACK_DEBIAN_PACKAGE_RELEASE} PARENT_SCOPE )
     else()
       set ( CPACK_DEBIAN_PACKAGE_RELEASE "local" PARENT_SCOPE )
@@ -146,13 +154,16 @@ function( set_variables )
 
     set( VERSION_COMMIT_COUNT "${VERSION_COMMIT_COUNT}" PARENT_SCOPE )
     set( VERSION_HASH "${VERSION_HASH}" PARENT_SCOPE )
+    set( VERSION_BUILD  "${VERSION_BUILD}" PARENT_SCOPE )
 
     message(STATUS "VERSION_MAJOR : ${VERSION_MAJOR}" )
     message(STATUS "VERSION_MINOR : ${VERSION_MINOR}" )
     message(STATUS "VERSION_PATCH : ${VERSION_PATCH}" )
+    message(STATUS "VERSION_POINT : ${VERSION_POINT}" )
     message(STATUS "ROCM_LIBPATCH_VERSION : ${ROCM_LIBPATCH_VERSION}" )
     message(STATUS "VERSION_COMMIT_COUNT : ${VERSION_COMMIT_COUNT}" )
     message(STATUS "VERSION_HASH : ${VERSION_HASH}" )
+    message(STATUS "VERSION_BUILD : ${VERSION_BUILD}" )
     message(STATUS "CPACK_DEBIAN_PACKAGE_RELEASE : ${CPACK_DEBIAN_PACKAGE_RELEASE}" )
     message(STATUS "CPACK_RPM_PACKAGE_RELEASE : ${CPACK_RPM_PACKAGE_RELEASE}" )