diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2016-09-13 16:20:01 -0500 |
|---|---|---|
| committer | Matt Spinler <spinler@us.ibm.com> | 2016-09-21 08:39:34 -0500 |
| commit | 3931483770436081d15a57a4d1a642fcc80c21c4 (patch) | |
| tree | 0d219029a66fb78912a85ec2c72b4b261708a9ff /meta-openbmc-machines | |
| parent | 0eb7c392d8fe24b390c04fba05af70d8cf8c7638 (diff) | |
| download | talos-openbmc-3931483770436081d15a57a4d1a642fcc80c21c4.tar.gz talos-openbmc-3931483770436081d15a57a4d1a642fcc80c21c4.zip | |
Fixup inventory generation dependencies
Resolves openbmc/openbmc#567.
Change-Id: I68e8e726f839038a6a256ff18a88d936ab0af3e4
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines')
3 files changed, 6 insertions, 1 deletions
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc index d70cbe638..c333784eb 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -15,3 +15,4 @@ PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-op-apps" +PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf index c43c588b8..9c60801e2 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf @@ -13,3 +13,5 @@ FLASH_SIZE = "32768" PHOSPHOR_MRW_URI = "git://github.com/open-power/palmetto-xml" PHOSPHOR_MRW_REV = "82818682f2c2009c30d700df6d5f8897a3096e4f" + +PREFERRED_PROVIDER_virtual/obmc-inventory-data = "obmc-inventory" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb index 6fedd2df4..97d12de34 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb @@ -3,4 +3,6 @@ DESCRIPTION = "Board wiring information for the Palmetto system." PR = "r1" inherit config-in-skeleton -RRECOMMENDS_${PN} += "virtual-system-inventory-data" + +PROVIDES_remove = "virtual/obmc-inventory-data" +RPROVIDES_${PN}_remove = "virtual-obmc-inventory-data" |
