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 <patrick@stwcx.xyz>
Change-Id: I0995a3d80604f71900222983574f3b29d418fe1b
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
index 9c7a39a..97da01f 100644
--- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
+++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
@@ -3,24 +3,11 @@
UBOOT_MACHINE = "ast_g5_ncsi_config"
+require conf/machine/include/facebook.inc
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
SERIAL_CONSOLES = "57600;ttyS4"
-OBMC_MACHINE_FEATURES += "\
- obmc-phosphor-fan-mgmt \
- obmc-phosphor-chassis-mgmt \
- obmc-phosphor-flash-mgmt \
- obmc-host-ipmi \
- obmc-host-state-mgmt \
- obmc-chassis-state-mgmt \
- obmc-bmc-state-mgmt \
- "
PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= ""
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps"
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
FLASH_SIZE = "32768"
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
-VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control"
-VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control"