meta-ampere: mtjade: fru: remove redundant dimm0/1, cpu0/1
When running "ipmitool fru print" command, the output shows
dimm0/1, cpu0/1 without data. This is from the host-ipmid which uses
default configuration file to handle "Get SDR"/"Get Device SDR" command,
including DIMM0/1, CPU0/1.
This commit configures to use mtjade-ipmi-fru.yaml file so that correct
FRU information is displayed, preventing the DIMM0/1, CPU0/1 to be
reported.
Tested:
- Check fru information.
$ ipmitool fru print
--> Console does not display DIMM0/1, CPU0/1 data. FRU data is displayed.
Signed-off-by: Thang Tran <thuutran@amperecomputing.com>a
Change-Id: Ibd18bfd5656676ccef70608dd5f78b93ab8432fc
diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
index 376ebc0..06046c3 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
+++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
@@ -6,6 +6,7 @@
SRC_URI = " \
file://mtjade-ipmi-sensors.yaml \
+ file://mtjade-ipmi-fru.yaml \
"
S = "${WORKDIR}"
@@ -13,10 +14,13 @@
do_install() {
install -m 0644 -D mtjade-ipmi-sensors.yaml \
${D}${datadir}/${BPN}/ipmi-sensors.yaml
+ install -m 0644 -D mtjade-ipmi-fru.yaml \
+ ${D}${datadir}/${BPN}/ipmi-fru-read.yaml
}
FILES:${PN}-dev = " \
${datadir}/${BPN}/ipmi-sensors.yaml \
+ ${datadir}/${BPN}/ipmi-fru-read.yaml \
"
ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index d8d2390..283b506 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,8 +1,9 @@
FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
-DEPENDS:append = " ${MACHINE}-yaml-config"
+DEPENDS:append = " mtjade-yaml-config"
EXTRA_OEMESON = " \
- -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/${MACHINE}-yaml-config/ipmi-sensors.yaml \
+ -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-sensors.yaml \
+ -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \
"