summaryrefslogtreecommitdiffstats
path: root/meta-phosphor
diff options
context:
space:
mode:
Diffstat (limited to 'meta-phosphor')
-rw-r--r--meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc2
-rw-r--r--meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb5
2 files changed, 3 insertions, 4 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc
index 53287e8d3..097b4bc70 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc
+++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-settingsd"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
SRC_URI += "git://github.com/openbmc/phosphor-settingsd"
-SRCREV = "89872291c360dfb33824738c066a2171c3306910"
+SRCREV = "9711211cb53df56fb5bdf84e3882672ac7ec8a50"
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb
index 0653e2ec3..191a389ae 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb
+++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb
@@ -9,6 +9,8 @@ inherit setuptools
inherit obmc-phosphor-dbus-service
inherit pythonnative
+include phosphor-settings-manager.inc
+
DBUS_SERVICE_${PN} = "org.openbmc.settings.Host.service"
DEPENDS += "python-pyyaml-native"
@@ -16,11 +18,8 @@ RDEPENDS_${PN} += "python-dbus python-pygobject python-ipy"
PROVIDES += "virtual/obmc-settings-mgmt"
RPROVIDES_${PN} += "virtual-obmc-settings-mgmt"
-SRC_URI += "git://github.com/openbmc/phosphor-settingsd"
SRC_URI += "file://merge_settings.py"
-SRCREV = "672219903522547fbef7258748521c96bf86705c"
-
S = "${WORKDIR}/git"
# Collect files in SRC_URI that end in ".override.yml" and call a script that
OpenPOWER on IntegriCloud