diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-03-02 00:16:06 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-03-06 20:21:19 +0300 |
| commit | db32a7c5dc0f3318553444496360a25fa4cd99d2 (patch) | |
| tree | ea8274124133aa0e1b50bbb86bb23e15384270d0 /meta-phosphor/conf | |
| parent | 2cac4f7b07b4f0ca275048da76986055cee542d2 (diff) | |
| download | openbmc-db32a7c5dc0f3318553444496360a25fa4cd99d2.tar.xz | |
image: Use VIRTUAL-RUNTIME for state pkgs
The correct idiom for modeling runtime only virtual implementations
with no build time API is to use VIRTUAL-RUNTIME in favor of
PREFERRED_PROVIDER.
Update the state management management applications accordingly
since they fall into this category.
Change-Id: I8f0092a38da4ea0741dd0f464b71f4ea12d12019
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/conf')
| -rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-defaults.inc | 21 | ||||
| -rw-r--r-- | meta-phosphor/conf/distro/openbmc-phosphor.conf | 3 |
2 files changed, 18 insertions, 6 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 0577085a6..f7ac0b5ec 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -8,14 +8,29 @@ OBMC_POWER_INSTANCES ?= "0" OBMC_RESET_BUTTON_INSTANCES ?= "0" OBMC_WATCHDOG_INSTANCES ?= "0" -PREFERRED_PROVIDER_virtual/obmc-bmc-state-mgmt ?= "phosphor-state-manager" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt ?= "obmc-phosphor-chassisd" -PREFERRED_PROVIDER_virtual/obmc-chassis-state-mgmt ?= "phosphor-state-manager" PREFERRED_PROVIDER_virtual/obmc-event-mgmt ?= "obmc-phosphor-event" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt ?= "obmc-phosphor-fand" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt ?= "obmc-phosphor-flashd" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-hw-example" -PREFERRED_PROVIDER_virtual/obmc-host-state-mgmt ?= "phosphor-state-manager" + +# obmc-bmc-state-manager +# +# Provides an implementation of the xyz.openbmc_project.State.BMC +# interface. +VIRTUAL-RUNTIME_obmc-bmc-state-manager ?= "phosphor-state-manager-bmc" + +# obmc-chassis-state-manager +# +# Provides an implementation of the xyz.openbmc_project.State.Chassis +# interface. +VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "phosphor-state-manager-chassis" + +# obmc-host-state-manager +# +# Provides an implementation of the xyz.openbmc_project.State.Host +# interface. +VIRTUAL-RUNTIME_obmc-host-state-manager ?= "phosphor-state-manager-host" # obmc-inventory-manager # diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index 0cf12f69e..11b816558 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -33,9 +33,6 @@ DISTRO_FEATURES = "\ obmc-host-ctl \ avahi \ slp \ - obmc-host-state-mgmt \ - obmc-chassis-state-mgmt \ - obmc-bmc-state-mgmt \ obmc-net-ipmi \ ${DISTRO_FEATURES_LIBC} \ " |