diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-01-28 13:00:52 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-02-02 13:44:28 +0000 |
| commit | 2f63e8c040e2b7149585697d24d2bd6dc37f651a (patch) | |
| tree | 824fe3ce8b4b9f7f5e9ae0b045f5f5d03665f732 /meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison | |
| parent | 0a544b5f874e81a1c4579d3de113c176668b6c80 (diff) | |
| download | talos-openbmc-2f63e8c040e2b7149585697d24d2bd6dc37f651a.tar.gz talos-openbmc-2f63e8c040e2b7149585697d24d2bd6dc37f651a.zip | |
ipmi: Remove virtual/phosphor-ipmi-fru-config
Replace this virtual with two others:
-virtual/phosphor-ipmi-fru-hostfw-config
-virtual/phosphor-ipmi-fru-inventory.
Update ipmi-fru-parser machine recipes to provide
virtual/phosphor-ipmi-fru-inventory rather than
virtual/phosphor-ipmi-fru-config.
Remove machine recipes on machines that use MRW
since a single MRW recipe provides for any MRW
using system automatically.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com?
Change-Id: Ia0d94b938eb2c7bfadd5a018ae5ea136f14dd874
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison')
3 files changed, 23 insertions, 19 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf index 5653e5bde..436c68a97 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/conf/machine/garrison.conf @@ -11,4 +11,4 @@ UBOOT_LOADADDRESS = "0x40008000" FLASH_SIZE = "32768" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-config = "garrison-ipmi-inventory-map" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "garrison-ipmi-inventory-map-native" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map-native.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map-native.bb new file mode 100644 index 000000000..d119208f4 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map-native.bb @@ -0,0 +1,22 @@ +SUMMARY = "Garrison IPMI to DBus Inventory mapping." +PR = "r1" + +inherit native +inherit obmc-phosphor-license +inherit phosphor-ipmi-fru + +SRC_URI += "file://config.yaml" + +PROVIDES += "virtual/phosphor-ipmi-fru-inventory" + +S = "${WORKDIR}" + +do_install() { + # TODO: install this to inventory_datadir + # after ipmi-fru-parser untangles the host + # firmware config from the machine inventory. + DEST=${D}${config_datadir} + + install -d ${DEST} + install config.yaml ${DEST} +} diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map.bb deleted file mode 100644 index 05a622fce..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/ipmi/garrison-ipmi-inventory-map.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Garrison IPMI to DBus Inventory mapping." -PR = "r1" - -inherit native -inherit obmc-phosphor-license - -SRC_URI += "file://config.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-config" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${datadir}/phosphor-ipmi-fru - - install -d ${DEST} - install config.yaml ${DEST} -} |
