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>
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
index aae4af8..3638df9 100644
--- a/common/recipes-phosphor/host-ipmid/host-ipmid.bb
+++ b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
@@ -15,9 +15,9 @@
DEPENDS += "autoconf-archive-native"
RDEPENDS_${PN}-dev += "obmc-mapper-dev"
RDEPENDS_${PN} += "clear-once"
-RDEPENDS_${PN} += "settings"
RDEPENDS_${PN} += "network"
RDEPENDS_${PN} += "libmapper"
+RRECOMMENDS_${PN} += "virtual-obmc-settings-mgmt"
SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
SRCREV = "00b1e5be1ce0d74541e371790e36a53146cb3b44"
diff --git a/common/recipes-phosphor/settings/settings.bb b/common/recipes-phosphor/settings/phosphor-settings.bb
similarity index 70%
rename from common/recipes-phosphor/settings/settings.bb
rename to common/recipes-phosphor/settings/phosphor-settings.bb
index 6627ee1..09d6850 100644
--- a/common/recipes-phosphor/settings/settings.bb
+++ b/common/recipes-phosphor/settings/phosphor-settings.bb
@@ -5,8 +5,12 @@
inherit obmc-phosphor-license
inherit obmc-phosphor-systemd
+inherit setuptools
+DEPENDS += "python-pyyaml-native"
RDEPENDS_${PN} += "python-dbus python-pygobject"
+PROVIDES += "virtual/obmc-settings-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-settings-mgmt"
SRC_URI += "git://github.com/openbmc/phosphor-settingsd"
@@ -14,9 +18,3 @@
S = "${WORKDIR}/git"
-do_install() {
- install -d ${D}/${sbindir}
- install ${S}/settings_file.py ${D}/${sbindir}
- install ${S}/settings_manager.py ${D}/${sbindir}
-}
-
diff --git a/common/recipes-phosphor/settings/settings/settings.service b/common/recipes-phosphor/settings/phosphor-settings/phosphor-settings.service
similarity index 100%
rename from common/recipes-phosphor/settings/settings/settings.service
rename to common/recipes-phosphor/settings/phosphor-settings/phosphor-settings.service