commit 89f2ff261385c43bd181739b0e60031223940c55
author George Hung <george.hung@quantatw.com> Thu Mar 25 13:59:12 2021 +0800
committer Brandon Kim <brandonkim@google.com> Thu Mar 25 18:39:21 2021 +0000
tree 096f84df01c92a8ec2a094027b692dc093daffb0
parent 3f2570e74ef929c7449911df18c1a8b9a59f02f1

meta-quanta: gbs: overwrite the WCTEMP reading to json config

Read WCTEMP reading and overwrite to config-margin.json
and update the WCTEMP variables to be wrapped in @@ to
avoid any mis-replacement

Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: I2f6eae64acc1db089c1a3ca48288ae360d555dac

meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh

diff --git a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh
index d0cb2f6..23742a6 100644
--- a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh
+++ b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh
@@ -1,22 +1,15 @@
 #!/bin/bash
 
-MARGIN_TABLE_FILE="/usr/share/read-margin-temp/config-margin.json"
+MARGIN_TABLE_FILE_IN="/usr/share/read-margin-temp/config-margin.json.in"
+TEMP_FILE="$(mktemp)"
+cp "$MARGIN_TABLE_FILE_IN" "$TEMP_FILE"
 
-target_num="$(cat $MARGIN_TABLE_FILE | grep '"target"' | wc -l)"
-
-cpu_hwmon="$(ls -la /sys/class/hwmon | grep f0082000 |  head -n 1 | tail -n +1 | cut -d '/' -f 11)"
-
-# replace by the real cpu temperature hwmon path in runtime
-if [[ "$cpu_hwmon" != "" ]]
-then
-     sed -i "s/cpu_hwmon/$cpu_hwmon/g" $MARGIN_TABLE_FILE
-fi
+target_num="$(cat $TEMP_FILE | grep '"target"' | wc -l)"
 
 # wait target dbus
-for ((i=0; i<$target_num; i++))
-do
+for ((i = 0; i < ${target_num}; i++)); do
     line_num=$((i+1))
-    path="$(cat $MARGIN_TABLE_FILE | grep '"target"' | head -n ${line_num} | tail -n +${line_num} | cut -d '"' -f 4)"
+    path="$(cat $TEMP_FILE | grep '"target"' | head -n ${line_num} | tail -n +${line_num} | cut -d '"' -f 4)"
     mapper wait $path
 done
 
@@ -24,7 +17,7 @@
 nvmeInventoryPath="/xyz/openbmc_project/inventory/system/chassis/motherboard/nvme"
 # Get and Set WCTEMP
 for ((i = 0; i < 16; i++)); do
-    name=WCTemp$(printf "%02d" $i)
+    name="@WCTemp$(printf "%02d" $i)@"
     wcTemp=72000
     presentState=$(busctl get-property \
         xyz.openbmc_project.Inventory.Manager \
@@ -42,9 +35,12 @@
         wcTemp=$((wcTemp * 1000))
     fi
 
-    sed -i "s/$name/${wcTemp}/g" $MARGIN_TABLE_FILE
+    sed -i "s/$name/${wcTemp}/g" $TEMP_FILE
 done
 
+# Use shell parameter expansion to trim the ".in" suffix
+mv "$TEMP_FILE" "${MARGIN_TABLE_FILE_IN%".in"}"
+
 # start read margin temp
 /usr/bin/read-margin-temp &