| commit | e4ffc43d852e9c26a781327ccf7a2f60c372a6bd | [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 | ffd075fe05e0c0517b6357586e799fcca80e3104 | |
| parent | 79b657721fbdad51da3e25e00be435e1fff0e4d3 [diff] |
Fixup inventory generation dependencies Resolves openbmc/openbmc#567. Change-Id: I68e8e726f839038a6a256ff18a88d936ab0af3e4 Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/conf/machine/include/openpower.inc b/conf/machine/include/openpower.inc index d70cbe6..c333784 100644 --- a/conf/machine/include/openpower.inc +++ b/conf/machine/include/openpower.inc
@@ -15,3 +15,4 @@ 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-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf index c43c588..9c60801 100644 --- a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf +++ b/meta-ibm/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-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb b/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb index 6fedd2d..97d12de 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb +++ b/meta-ibm/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"