meta-phosphor: distro: remove obmc-settings-mgmt

Remove VIRTUAL-RUNTIME_obmc-settings-mgmt.  phosphor-settings-manager is
the de-facto standard for settings management in OpenBMC.

This is a minor improvement to ease of consumption and
comprehensibility.  If a popular alternative to
phosphor-settings-manager emerges, revisit the need for this abstraction
then.  For un-popular alternatives, bitbake still provides the means for
doing this entirely in downstream layers.

(From meta-phosphor rev: a71cf481ef2f836c839542818e03eda058bc5ef9)

Change-Id: Id563e252c14627e5842c9353e0631901be876326
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

5 files changed, 3 insertions, 9 deletions

diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc
index f6a8256a8..bd2dcace9 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -100,7 +100,6 @@ DISTRO_FEATURES_OBMC = " \
         obmc-phosphor-fan-mgmt \
         obmc-phosphor-flash-mgmt \
         obmc-phosphor-system-mgmt \
-        obmc-settings-mgmt \
         "
 
 DISTRO_FEATURES_DEFAULT = " \
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index 55b6e0fec..58be25a05 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -110,11 +110,6 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt ??= "obmc-phosphor-sysd"
 # automatically if the MRW feature is enabled.
 VIRTUAL-RUNTIME_phosphor-hwmon-config ?= ""
 
-# obmc-settings-mgmt
-#
-# Provides a manager for user settings.
-VIRTUAL-RUNTIME_obmc-settings-mgmt ?= "phosphor-settings-manager"
-
 # obmc-network-manager
 #
 # Provide support for managing network
diff --git a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb
index 9fbd28708..2dc630386 100644
--- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb
@@ -15,7 +15,7 @@ DEPENDS += "sdbusplus"
 DEPENDS += "sdbusplus-native"
 DEPENDS += "phosphor-logging"
 DEPENDS += "phosphor-dbus-interfaces"
-RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-settings-mgmt}"
+RDEPENDS_${PN} += "phosphor-settings-manager"
 RDEPENDS_${PN} += "phosphor-network"
 RDEPENDS_${PN} += "phosphor-mapper"
 
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
index a59e1fdd0..fdf6f1794 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
@@ -60,7 +60,7 @@ GROUPADD_PARAM_${PN} = "ipmi"
 
 SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service phosphor-ipmi-host.service"
 
-RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-settings-mgmt}"
+RRECOMMENDS_${PN} += "phosphor-settings-manager"
 
 
 require ${PN}.inc
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 28f375363..916538272 100644
--- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -128,7 +128,7 @@ RDEPENDS_${PN}-debug-collector = " \
 
 SUMMARY_${PN}-settings = "Settings applications"
 RDEPENDS_${PN}-settings = " \
-        ${VIRTUAL-RUNTIME_obmc-settings-mgmt} \
+        phosphor-settings-manager \
         "
 
 SUMMARY_${PN}-network = "BMC Network Manager"