FW Watchdog: overwrite PRODUCT_ASSET_TAG when we are on QEMU

5 files changed, 33 insertions, 30 deletions

diff --git a/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog.bb b/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog.bb
index 1d17ee02e2..330508956b 100644
--- a/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog.bb
+++ b/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog.bb
@@ -21,9 +21,13 @@ SRC_URI += "file://firmware-watchdog \
             file://logrotate    \
             file://post-install \
             file://post-upgrade \
+            file://virtual-asset-tag \
            "
 
 do_install:append(){
+    install -d ${D}${bindir}
+    install -m 0755 ${WORKDIR}/virtual-asset-tag   ${D}${bindir}
+
     install -d ${D}${sbindir}
     install -m 0755 ${WORKDIR}/firmware-watchdog   ${D}${sbindir}
     install -m 0755 ${WORKDIR}/post-install        ${D}${sbindir}
@@ -33,27 +37,3 @@ do_install:append(){
     install -m 0644 ${WORKDIR}/logrotate           ${D}${sysconfdir}/logrotate.d/firmware-watchdog
 }
 
-
-#
-#S = "${WORKDIR}"
-#SRC_URI = "file://kernel-panic-check.sh \
-#           file://kernel-panic-check.service \
-#"
-#
-#LICENSE = "Apache-2.0"
-#LIC_FILES_CHKSUM = "file://${IBSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
-#RDEPENDS:${PN} += "bash logger-systemd"
-#
-#inherit systemd
-#
-#FILES:${PN} += "${systemd_system_unitdir}/kernel-panic-check.service"
-#
-#do_install() {
-#    install -d ${D}${systemd_system_unitdir}
-#    install -m 0644 ${WORKDIR}/kernel-panic-check.service ${D}${systemd_system_unitdir}
-#    install -d ${D}${bindir}
-#    install -m 0755 ${S}/kernel-panic-check.sh ${D}/${bindir}/kernel-panic-check.sh
-#}
-#
-#SYSTEMD_SERVICE:${PN} += " kernel-panic-check.service"
-#
\ No newline at end of file
diff --git a/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/firmware-watchdog b/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/firmware-watchdog
index 9e5d6b5e3b..8e31e8ba58 100644
--- a/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/firmware-watchdog
+++ b/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/firmware-watchdog
@@ -52,12 +52,6 @@ if [ "${REQUEST_COUNTER}" -ge "0" -a "${REQUEST_COUNTER}" -lt "9" ] ; then
 
     set_status operative
     push_log "operative"
-
-    # Detect Virtualization (testing):
-    if `dmesg | grep -q "aspeed-smc 1e620000.spi: mx25l25635e"` ; then
-      /usr/bin/busctl set-property xyz.openbmc_project.FruDevice /xyz/openbmc_project/FruDevice/CP2_5422 xyz.openbmc_project.FruDevice PRODUCT_ASSET_TAG s "Virtual BMC"
-    fi
-
     set_counter 9
     exit 0
   fi
diff --git a/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/post-install b/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/post-install
index 55dc4951cf..ea59f03cbd 100644
--- a/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/post-install
+++ b/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/post-install
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+/usr/bin/virtual-asset-tag &  2>/dev/null 1>/dev/null
 /usr/bin/bmcweb-init-certs &  2>/dev/null 1>/dev/null
 
 exit 0
diff --git a/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/post-upgrade b/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/post-upgrade
index 55dc4951cf..ea59f03cbd 100644
--- a/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/post-upgrade
+++ b/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/post-upgrade
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+/usr/bin/virtual-asset-tag &  2>/dev/null 1>/dev/null
 /usr/bin/bmcweb-init-certs &  2>/dev/null 1>/dev/null
 
 exit 0
diff --git a/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/virtual-asset-tag b/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/virtual-asset-tag
new file mode 100644
index 0000000000..590425f9ef
--- /dev/null
+++ b/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/virtual-asset-tag
@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# Detect Virtualization:
+#
+
+model="CP2.*"
+spi_flash_model="mx25l25635e"
+interface=xyz.openbmc_project.FruDevice
+asset_tag_var=PRODUCT_ASSET_TAG
+
+# no more than 20 chars:
+# ---------------------
+asset_tag_val='"Virtual BMC"'
+
+run_cmd() {
+  local cmd="${*}";
+  eval $cmd
+}
+
+get_model_path() {
+  local path=$(/usr/bin/busctl tree ${interface} | grep "/FruDevice/${model}" | sed 's,^[ \t`-]*,,' | sed 's,[ \t]*$,,')
+  echo "${path}"
+}
+
+if `dmesg | grep -q "aspeed-smc 1e620000.spi: ${spi_flash_model}"` ; then
+  run_cmd /usr/bin/busctl set-property ${interface} $(get_model_path) ${interface} ${asset_tag_var} s ${asset_tag_val}
+fi