diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2020-05-01 19:13:39 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-06 23:42:28 +0300 |
| commit | 3fa06b6de94f5527f4277055445f21e2bfe73b9b (patch) | |
| tree | 4e636d5fda6430d224d02c4e45bde327f6a219e3 /meta-facebook | |
| parent | d0183da9a284b01300ae62d2f50e7e80262bf6a8 (diff) | |
| download | openbmc-3fa06b6de94f5527f4277055445f21e2bfe73b9b.tar.xz | |
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>
Diffstat (limited to 'meta-facebook')
4 files changed, 48 insertions, 27 deletions
diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc new file mode 100644 index 0000000000..9b6e3ef73b --- /dev/null +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -0,0 +1,22 @@ +OBMC_MACHINE_FEATURES += "\ + obmc-bmc-state-mgmt \ + obmc-chassis-state-mgmt \ + obmc-host-ipmi \ + obmc-host-state-mgmt \ + obmc-phosphor-chassis-mgmt \ + obmc-phosphor-fan-mgmt \ + obmc-phosphor-flash-mgmt \ + " + +VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" +VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" +VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" + +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-fb-apps" +PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-fb-apps" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps" +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" +PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" + +OVERRIDES .= ":facebook" diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf index 9c7a39ae60..97da01fb07 100644 --- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf +++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf @@ -3,24 +3,11 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb" 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" diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf index d37fc56dd3..97da01fb07 100644 --- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf +++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf @@ -3,22 +3,11 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb" 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" FLASH_SIZE = "32768" -VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" - diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index 1709ac2eda..1dcc7cbf49 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 \ |