diff options
author | Adriana Kobylak <anoo@us.ibm.com> | 2016-08-25 18:07:34 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-09-29 04:59:09 +0300 |
commit | 1ffadd9504c39593c61326444a5f34495b053f33 (patch) | |
tree | b7bbc95a5827de7c14ed10eb92f3883fd727fee1 /meta-phosphor/conf | |
parent | ace81b5c1927abc09d9f070fe2f0944dba9db213 (diff) | |
download | openbmc-1ffadd9504c39593c61326444a5f34495b053f33.tar.xz |
phosphor-settings: Remove install step and make it a virtual package
Move the settings dbus object to a virtual package, replace the
dependency from ipmi with a recommends, and update the recipe to
make use of the new python setup script in the phosphor-settingsd
repository.
Change-Id: I0566ed267a6cd5e06f701ba54b1021a9a8268a20
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'meta-phosphor/conf')
-rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-defaults.inc | 1 | ||||
-rw-r--r-- | meta-phosphor/conf/distro/openbmc-phosphor.conf | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 601275e74..522a639d6 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -17,3 +17,4 @@ PREFERRED_PROVIDER_virtual/obmc-fan-mgmt ?= "obmc-phosphor-fand" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt ?= "obmc-phosphor-flashd" 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" diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index 97667ea46..0b6278398 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -26,6 +26,7 @@ DISTRO_FEATURES = "\ obmc-phosphor-flash-mgmt \ obmc-phosphor-event-mgmt \ obmc-phosphor-user-mgmt \ + obmc-settings-mgmt \ obmc-phosphor-system-mgmt \ obmc-host-ipmi \ ${DISTRO_FEATURES_LIBC} \ |