From e2dec172847e5b9530ef4bdc1935886f90656655 Mon Sep 17 00:00:00 2001
From: Charis Poag <Charis.Poag@amd.com>
Date: Mon, 5 Jun 2023 13:50:13 -0500
Subject: [PATCH 1/2] [SWDEV-402336 + SWDEV-398070] Fix RPM install part2

Updates:
    [rocm-smi] RPM installation comment included a macro,
    now removed

Change-Id: Ifa7a8d2d1a713940c39e20df9d02635e0e623dd8
Signed-off-by: Charis Poag <Charis.Poag@amd.com>
---
 DEBIAN/postinst.in | 2 +-
 RPM/post.in        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DEBIAN/postinst.in b/DEBIAN/postinst.in
index 98e9365825..eaccaa938b 100755
--- a/DEBIAN/postinst.in
+++ b/DEBIAN/postinst.in
@@ -38,7 +38,7 @@ do_configureLogrotate() {
     dateformat .%%Y-%%m-%%d_%H:%%M:%%S
 }
 EOF
-  # Fix for %S argument not found (now we escape with %%)
+  # Fix for % S argument not found (now we escape with %%)
   # issue was RPM build thought we were using macros
   # https://gitlab.kitware.com/cmake/cmake/-/issues/22965
   # https://rpm-software-management.github.io/rpm/manual/spec.html
diff --git a/RPM/post.in b/RPM/post.in
index bfb0613388..29787d660f 100755
--- a/RPM/post.in
+++ b/RPM/post.in
@@ -37,7 +37,7 @@ do_configureLogrotate() {
     dateformat .%%Y-%%m-%%d_%H:%%M:%%S
 }
 EOF
-  # Fix for %S argument not found (now we escape with %%)
+  # Fix for % S argument not found (now we escape with %%)
   # issue was RPM build thought we were using macros
   # https://gitlab.kitware.com/cmake/cmake/-/issues/22965
   # https://rpm-software-management.github.io/rpm/manual/spec.html

From f78f9a40824a47929fb910fe6deba069e47afdcf Mon Sep 17 00:00:00 2001
From: "Galantsev, Dmitrii" <dmitrii.galantsev@amd.com>
Date: Mon, 5 Jun 2023 17:06:46 -0500
Subject: [PATCH 2/2] Fix test temp blacklist, ignore TestVoltCurvRead

Change-Id: I86fa14fdc06e1b170a0bc0c0727fc08e4f4e2074
Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>
---
 tests/rocm_smi_test/rsmitst.exclude | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/rocm_smi_test/rsmitst.exclude b/tests/rocm_smi_test/rsmitst.exclude
index 3de139d45f..4739f70b26 100644
--- a/tests/rocm_smi_test/rsmitst.exclude
+++ b/tests/rocm_smi_test/rsmitst.exclude
@@ -12,14 +12,16 @@ PERMANENT_BLACKLIST_ALL_ASICS=
 
 # This is the temporary blacklist for all ASICs. This is to be used when a test
 # is failing consistently
-TEMPORARY_BLACKLIST_ALL_ASICS=
+TEMPORARY_BLACKLIST_ALL_ASICS=\
+"rsmitstReadOnly.TestVoltCurvRead"
 
-if [ -z $PERMANENT_BLACKLIST_ALL_ASICS -a -z $TEMPORARY_BLACKLIST_ALL_ASICS ]; then
+
+if [ -z "$PERMANENT_BLACKLIST_ALL_ASICS" -a -z "$TEMPORARY_BLACKLIST_ALL_ASICS" ]; then
   BLACKLIST_ALL_ASICS=
 else
   BLACKLIST_ALL_ASICS=\
-    "$PERMANENT_BLACKLIST_ALL_ASICS:"\
-    "$TEMPORARY_BLACKLIST_ALL_ASICS"
+"$PERMANENT_BLACKLIST_ALL_ASICS:"\
+"$TEMPORARY_BLACKLIST_ALL_ASICS"
 fi
 
 # Device specific blacklists
@@ -63,4 +65,4 @@ $BLACKLIST_ALL_ASICS\
 "rsmitstReadWrite.FanReadWrite:"\
 "rsmitstReadWrite.TestOverdriveReadWrite:"\
 "rsmitstReadWrite.TestPowerReadWrite:"\
-"rsmitstReadWrite.TestPowerCapReadWrite"
\ No newline at end of file
+"rsmitstReadWrite.TestPowerCapReadWrite"