From e0f68840a4368f1fb753c4adc4c652f1b79f972d Mon Sep 17 00:00:00 2001 From: "Galantsev, Dmitrii" Date: Mon, 8 Jul 2024 11:24:45 -0500 Subject: [PATCH 1/2] Fix return 0 on failed do_configureLogrotate Fixes https://github.com/ROCm/rocm_smi_lib/issues/184 Change-Id: I206927835de8811df6813c7a9b0b92258d776894 Signed-off-by: Galantsev, Dmitrii [ROCm/rocm_smi_lib commit: e2e65cc7ad1e649e4d87f587524ae7f50a2026ae] --- projects/rocm-smi-lib/DEBIAN/postinst.in | 2 +- projects/rocm-smi-lib/RPM/post.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/rocm-smi-lib/DEBIAN/postinst.in b/projects/rocm-smi-lib/DEBIAN/postinst.in index 641949f95a..875b71cb52 100755 --- a/projects/rocm-smi-lib/DEBIAN/postinst.in +++ b/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" diff --git a/projects/rocm-smi-lib/RPM/post.in b/projects/rocm-smi-lib/RPM/post.in index d2bd016589..ddc7025a70 100755 --- a/projects/rocm-smi-lib/RPM/post.in +++ b/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 From 96fd0e1ea49948eab5117f09033ae4f69b6e4b6a Mon Sep 17 00:00:00 2001 From: Maisam Arif Date: Wed, 10 Jul 2024 19:54:13 -0500 Subject: [PATCH 2/2] Bump version lib:7.3.0 tool:2.3.0+hash Signed-off-by: Maisam Arif Change-Id: I637b34e03580d5b5efb1e12805a9cdeb7778de74 [ROCm/rocm_smi_lib commit: db4d81b9447d31a5e8261b5b696abe2cdfd1647a] --- projects/rocm-smi-lib/CMakeLists.txt | 2 +- projects/rocm-smi-lib/python_smi_tools/rocm_smi.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/rocm-smi-lib/CMakeLists.txt b/projects/rocm-smi-lib/CMakeLists.txt index aba5aa69f8..5b6b7c48d2 100755 --- a/projects/rocm-smi-lib/CMakeLists.txt +++ b/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}") diff --git a/projects/rocm-smi-lib/python_smi_tools/rocm_smi.py b/projects/rocm-smi-lib/python_smi_tools/rocm_smi.py index 11f0bc3dc4..5dfad29731 100755 --- a/projects/rocm-smi-lib/python_smi_tools/rocm_smi.py +++ b/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)