| commit | c205b171efa1224f899cbf9539adfdc3cea83304 | [log] [tgz] |
|---|---|---|
| author | Matt Spinler <spinler@us.ibm.com> | Tue Sep 13 16:20:01 2016 -0500 |
| committer | Matt Spinler <spinler@us.ibm.com> | Wed Sep 21 08:39:34 2016 -0500 |
| tree | 83f572e897ecdb583f8892357894a8da0790e2ce | |
| parent | 9a2a45d8ee8992f14661e367d1bd3780de83cea5 [diff] |
Fixup inventory generation dependencies Resolves openbmc/openbmc#567. Change-Id: I68e8e726f839038a6a256ff18a88d936ab0af3e4 Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/meta-palmetto/conf/machine/palmetto.conf b/meta-palmetto/conf/machine/palmetto.conf index c43c588..9c60801 100644 --- a/meta-palmetto/conf/machine/palmetto.conf +++ b/meta-palmetto/conf/machine/palmetto.conf
@@ -13,3 +13,5 @@ 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-palmetto/recipes-phosphor/workbook/palmetto-config.bb b/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb index 6fedd2d..97d12de 100644 --- a/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb +++ b/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb
@@ -3,4 +3,6 @@ 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"