From 3fa06b6de94f5527f4277055445f21e2bfe73b9b Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 1 May 2020 11:13:39 -0500 Subject: meta-facebook: restructure phosphor default-virtuals Due to our structure and missing RPROVIDES we were picking up old python-based implementations of some daemons. Restructure our conf and package group files to look more like meta-intel, and point to the proper implementations of services. (From meta-facebook rev: fbe12f7a42a592be01e2ced7215705ad5261e529) Signed-off-by: Patrick Williams Change-Id: I0995a3d80604f71900222983574f3b29d418fe1b Signed-off-by: Andrew Geissler --- .../packagegroups/packagegroup-fb-apps.bb | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'meta-facebook/recipes-fb/packagegroups') diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index 1709ac2ed..1dcc7cbf4 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -5,13 +5,37 @@ inherit packagegroup PROVIDES = "${PACKAGES}" PACKAGES = " \ + ${PN}-chassis \ + ${PN}-fans \ + ${PN}-flash \ ${PN}-system \ " +PROVIDES += "virtual/obmc-chassis-mgmt" +PROVIDES += "virtual/obmc-fan-mgmt" +PROVIDES += "virtual/obmc-flash-mgmt" PROVIDES += "virtual/obmc-system-mgmt" +RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" +SUMMARY_${PN}-chassis = "Facebook Chassis" +RDEPENDS_${PN}-chassis = " \ + x86-power-control \ + " + +SUMMARY_${PN}-fans = "Facebook Fans" +RDEPENDS_${PN}-fans = " \ + phosphor-pid-control \ + " + +SUMMARY_${PN}-flash = "Facebook Flash" +RDEPENDS_${PN}-flash = " \ + phosphor-software-manager \ + " + SUMMARY_${PN}-system = "Facebook System" RDEPENDS_${PN}-system = " \ entity-manager \ @@ -19,7 +43,6 @@ RDEPENDS_${PN}-system = " \ fb-powerctrl \ phosphor-ipmi-ipmb \ fb-ipmi-oem \ - phosphor-pid-control \ phosphor-hostlogger \ phosphor-sel-logger \ ipmitool \ -- cgit v1.2.3