meta-fii: meta-mori: Get BMC version from os-release
This will parse the Major, sub-Major, and Minor versions from the
/etc/os-release file VERSION_ID line. The version will be presented
with the pattern <Major>.<sub-Major>.<Minor>.
Signed-off-by: Charles Boyer <Charles.Boyer@fii-usa.com>
Change-Id: I6cfebf16b840cb88216c3b8f3aeb4c295abc3e05
diff --git a/meta-fii/meta-mori/conf/distro/openbmc-mori.conf b/meta-fii/meta-mori/conf/distro/openbmc-mori.conf
index be036c4..de9fe20 100644
--- a/meta-fii/meta-mori/conf/distro/openbmc-mori.conf
+++ b/meta-fii/meta-mori/conf/distro/openbmc-mori.conf
@@ -1,4 +1,3 @@
require conf/distro/gbmc.conf
DISTRO = "openbmc-mori"
-VERSION_ID:mori = "v0.1-00-mori"
diff --git a/meta-fii/meta-mori/recipes-mori/mori-sys-utility/mori-cmd/mori.sh b/meta-fii/meta-mori/recipes-mori/mori-sys-utility/mori-cmd/mori.sh
index f7451d7..93fe109 100644
--- a/meta-fii/meta-mori/recipes-mori/mori-sys-utility/mori-cmd/mori.sh
+++ b/meta-fii/meta-mori/recipes-mori/mori-sys-utility/mori-cmd/mori.sh
@@ -109,15 +109,13 @@
cmd=$(cat ${MB_CPLD_VER_FILE})
echo " MB_CPLD: " "${cmd}"
- major=$(ipmitool mc info | grep "Firmware Revision" | awk '{print $4}')
- cmd=$(ipmitool mc info | tail -4 | tr -s '\t' ' ' | tr -s '\n' ' ')
+ # BMC Version
- for hex in $cmd; do
- minor="${hex:2}$minor";
- done
-
- minor=$(echo "obase=10; ibase=16; ${minor^^}" | bc)
- echo " BMC : " "${major}"."${minor}"
+ # Save VERSION_ID line in string "VERSION_ID=*-Major.Submajor.Minor.Subminor" and
+ # extract the substring after - sign "Major.Submajor.Minor.Subminor"
+ BMCVersion=$(awk '/VERSION_ID/' /etc/os-release | sed "s/.*-//g")
+ # BMCVersion="Major.Submajor.Minor"
+ echo " BMC: ${BMCVersion%.*}"
#BMC PWR Sequencer
i2cset -y -f -a "${I2C_BMC_PWRSEQ[0]}" 0x"${I2C_BMC_PWRSEQ[1]}" 0xfe 0x0000 w