diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2017-01-20 06:20:46 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-01-20 06:20:49 +0300 |
| commit | 9e206396d08360bf8248e571d07337cd75ad8fe0 (patch) | |
| tree | 36b8324d9e3c9b440ad372b5e10ebc5b4e90a013 /meta-phosphor/conf | |
| parent | 48b42e0086847aa8b87b4102d7af315d91f3b45d (diff) | |
| download | openbmc-9e206396d08360bf8248e571d07337cd75ad8fe0.tar.xz | |
phosphor-state-manager: remove daemon duplication
The phosphor-state-manager repository builds [at least] two executables:
* phosphor-host-state-manager
* phosphor-chassis-state-manager
phosphor-host-state-manager.bb and phosphor-chassis-state-manager.bb
were effectively the exact same file and had no assignment of
executables to files. The result was that both packages installed both
daemons and caused an installation collision.
Combine the two recipes into a single recipe with the correct package
relationship for each executable.
Change-Id: I76a1e598bebc5090ae374271bbd5e8e32967cb43
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-phosphor/conf')
| -rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-defaults.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 6008210937..30f1f7b55f 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -19,8 +19,8 @@ PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt ?= "obmc-phosphor-sensord" PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd" PREFERRED_PROVIDER_virtual/obmc-settings-mgmt ?= "phosphor-settings" PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging" -PREFERRED_PROVIDER_virtual/obmc-host-state-mgmt ?= "phosphor-host-state-manager" -PREFERRED_PROVIDER_virtual/obmc-chassis-state-mgmt ?= "phosphor-chassis-state-manager" +PREFERRED_PROVIDER_virtual/obmc-host-state-mgmt ?= "phosphor-state-manager" +PREFERRED_PROVIDER_virtual/obmc-chassis-state-mgmt ?= "phosphor-state-manager" OBMC_DBUS_PATH_ROOT ?= "/xyz/openbmc_project" OBMC_DBUS_IFACE_ROOT ?= "xyz.openbmc_project" |