Fixup inventory generation dependencies
Resolves openbmc/openbmc#567.
Change-Id: I68e8e726f839038a6a256ff18a88d936ab0af3e4
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
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 d70cbe6..c333784 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-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 c43c588..9c60801 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 @@
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 6fedd2d..97d12de 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 @@
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"
diff --git a/meta-phosphor/classes/config-in-skeleton.bbclass b/meta-phosphor/classes/config-in-skeleton.bbclass
index 907f226..95c2d64 100644
--- a/meta-phosphor/classes/config-in-skeleton.bbclass
+++ b/meta-phosphor/classes/config-in-skeleton.bbclass
@@ -9,6 +9,9 @@
HOMEPAGE = "http://github.com/openbmc/skeleton"
+PROVIDES += "virtual/obmc-inventory-data"
+RPROVIDES_${PN} += "virtual-obmc-inventory-data"
+
DEPENDS += "python"
SRC_URI += "${SKELETON_URI};subpath=configs"
S = "${WORKDIR}/configs"
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb
index 73a598c..aa9f6b4 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb
@@ -5,7 +5,7 @@
inherit skeleton-python
inherit obmc-phosphor-dbus-service
-VIRTUAL-RUNTIME_skeleton_workbook ?= ""
+RRECOMMENDS_${PN} += "virtual-obmc-inventory-data"
RDEPENDS_${PN} += "\
python-argparse \
diff --git a/meta-phosphor/common/recipes-phosphor/inventory/obmc-inventory.bb b/meta-phosphor/common/recipes-phosphor/inventory/obmc-inventory.bb
index 692d74d..0403f6c 100644
--- a/meta-phosphor/common/recipes-phosphor/inventory/obmc-inventory.bb
+++ b/meta-phosphor/common/recipes-phosphor/inventory/obmc-inventory.bb
@@ -4,7 +4,8 @@
S = "${WORKDIR}/git"
-RPROVIDES_${PN} = "virtual-system-inventory-data"
+PROVIDES += "virtual/obmc-inventory-data"
+RPROVIDES_${PN} += "virtual-obmc-inventory-data"
inherit allarch
inherit obmc-phosphor-license