Merge amd-staging into amd-master 20240710

Signed-off-by: Maisam Arif <Maisam.Arif@amd.com>
Change-Id: I82f353d21279e2c1ee1788cb9e949b6d3b7e3270


[ROCm/rocm_smi_lib commit: 3cd677419e]

projects/rocm-smi-lib/CMakeLists.txt

@@ -38,7 +38,7 @@ find_program (GIT NAMES git)
 
 ## Setup the package version based on git tags.
 set(PKG_VERSION_GIT_TAG_PREFIX "rsmi_pkg_ver")
-get_package_version_number("7.2.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT)
+get_package_version_number("7.3.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT)
 message("Package version: ${PKG_VERSION_STR}")
 set(${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}")
 set(${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}")

projects/rocm-smi-lib/DEBIAN/postinst.in

@@ -107,7 +107,7 @@ do_ldconfig() {
 case "$1" in
   ( configure )
     do_ldconfig
-    do_configureLogrotate || return 0
+    do_configureLogrotate || exit 0
   ;;
   ( abort-upgrade | abort-remove | abort-deconfigure )
     echo "$1"

projects/rocm-smi-lib/RPM/post.in

@@ -107,5 +107,5 @@ do_ldconfig() {
 # post install or upgrade, $i is 1 or 2 -> do these actions
 if [ "$1" -ge 1 ]; then
   do_ldconfig
-  do_configureLogrotate || return 0
+  do_configureLogrotate || exit 0
 fi

projects/rocm-smi-lib/python_smi_tools/rocm_smi.py

@@ -32,7 +32,7 @@ from rsmiBindings import *
 # Patch version - Increment when adding a fix, set to 0 when minor is incremented
 # Hash  version - Shortened commit hash. Print here and not with lib for consistency with amd-smi
 SMI_MAJ = 2
-SMI_MIN = 2
+SMI_MIN = 3
 SMI_PAT = 0
 # SMI_HASH is provided by rsmiBindings
 __version__ = '%s.%s.%s+%s' % (SMI_MAJ, SMI_MIN, SMI_PAT, SMI_HASH)