phosphor-settingsd: srcrev bump 3d805fe94a..6f62cc844b
And convert recipe to python3.
Patrick Williams (3):
python2 to python3 conversion
MAINTAINERS: update Deepak's email address
delete deprecated python scripts
Change-Id: Ie00a27d4e8355307977ab1de12376b2879c0994f
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
diff --git a/recipes-phosphor/settings/phosphor-settings-manager.inc b/recipes-phosphor/settings/phosphor-settings-manager.inc
index a6223e9..d08273e 100644
--- a/recipes-phosphor/settings/phosphor-settings-manager.inc
+++ b/recipes-phosphor/settings/phosphor-settings-manager.inc
@@ -2,4 +2,4 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
SRC_URI += "git://github.com/openbmc/phosphor-settingsd"
-SRCREV = "3d805fe94abf741d4a228f8eef59f70bcb2328a7"
+SRCREV = "6f62cc844b3e9f356e8ee79af256c41069a57140"
diff --git a/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py b/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
index 01f5e35..d910da5 100755
--- a/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
+++ b/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""Loads a "target" YAML file and overwrites its values with values from
"override" YAML files.
@@ -28,7 +28,7 @@
"""
if not isinstance(source, dict):
return source
- for k, v in source.iteritems():
+ for k, v in source.items():
if k in target and isinstance(target[k], dict):
dict_merge(target[k], v)
else:
diff --git a/recipes-phosphor/settings/phosphor-settings-manager_git.bb b/recipes-phosphor/settings/phosphor-settings-manager_git.bb
index e528111..85a63d2 100644
--- a/recipes-phosphor/settings/phosphor-settings-manager_git.bb
+++ b/recipes-phosphor/settings/phosphor-settings-manager_git.bb
@@ -6,15 +6,15 @@
inherit autotools
inherit obmc-phosphor-dbus-service
-inherit pythonnative
+inherit python3native
inherit phosphor-settings-manager
require phosphor-settings-manager.inc
DBUS_SERVICE_${PN} = "xyz.openbmc_project.Settings.service"
-DEPENDS += "python-pyyaml-native"
-DEPENDS += "python-mako-native"
+DEPENDS += "${PYTHON_PN}-pyyaml-native"
+DEPENDS += "${PYTHON_PN}-mako-native"
DEPENDS += "autoconf-archive-native"
DEPENDS += "virtual/phosphor-settings-defaults"
DEPENDS += "${@df_enabled(d, 'obmc-mrw', 'phosphor-settings-read-settings-mrw-native')}"