From 9e206396d08360bf8248e571d07337cd75ad8fe0 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Thu, 19 Jan 2017 21:20:46 -0600 Subject: 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 --- meta-phosphor/conf/distro/include/phosphor-defaults.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-phosphor/conf/distro') diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 600821093..30f1f7b55 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" -- cgit v1.2.1