| commit | 6e8d3f083acf89775789641cbc012446e671da18 | [log] [tgz] |
|---|---|---|
| author | Lei YU <mine260309@gmail.com> | Sat Apr 28 16:55:57 2018 +0800 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Tue May 22 02:12:40 2018 +0000 |
| tree | e22fb834eee60bea16e86ea0326bc0e8772140fd | |
| parent | 3e37d38f660dd30f74db230056312bc279810441 [diff] |
meta-romulus: Add ipmi-fru-read-inventory config
Make both romulus-ipmi-inventory-map-native and
romulus-ipmi-fru-read-inventory-native recipes use the same yaml config.
Resolves: openbmc/openbmc#3134
Tested: Verify the generated fru-read-gen.cpp reflect the yaml config
and ipmi fru command prints the correct FRU information.
Change-Id: If52a883e0901d44cea473ac67e89d4361cd5354c
Signed-off-by: Lei YU <mine260309@gmail.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf index b16943a..e0323dc 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/machine/romulus.conf
@@ -15,3 +15,4 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "romulus-ipmi-inventory-map-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "romulus-led-manager-config-native" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory = "romulus-ipmi-fru-read-inventory-native"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/config.yaml similarity index 100% rename from meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-inventory-map/config.yaml rename to meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/files/config.yaml
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-inventory-native.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-inventory-native.bb new file mode 100644 index 0000000..5551200 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/ipmi/romulus-ipmi-fru-read-inventory-native.bb
@@ -0,0 +1,18 @@ +SUMMARY = "Romulus inventory map for phosphor-ipmi-host" +PR = "r1" + +inherit native +inherit obmc-phosphor-license +inherit phosphor-ipmi-host + +SRC_URI += "file://config.yaml" + +PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory" + +S = "${WORKDIR}" + +do_install() { + DEST=${D}${config_datadir} + install -d ${DEST} + install config.yaml ${DEST} +}