phosphor-host-ipmid: Move to python3
Bump the revision and use python3native
Change-Id: I46b0f0325a9af85c185099bf1a16e74366d6eab0
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
index 8babca2..3ec3270 100644
--- a/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
+++ b/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
@@ -2,4 +2,4 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
-SRCREV = "e0af1c496a2f79f0e9357a4344e800957aeed3fe"
+SRCREV = "31eed5c5c5d663834650b37fc8d8e2d95ac02284"
diff --git a/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py b/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
index 877e3eb..928e8bd 100755
--- a/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
+++ b/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""Copied from phosphor-settings-manager
Loads a "target" YAML file and overwrites its values with values from
"override" YAML files.
@@ -34,7 +34,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/ipmi/phosphor-ipmi-host_git.bb b/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
index fdf6f17..1f82e75 100644
--- a/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
+++ b/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
@@ -12,7 +12,7 @@
inherit obmc-phosphor-sdbus-service
inherit obmc-phosphor-systemd
inherit phosphor-ipmi-host
-inherit pythonnative
+inherit python3native
def ipmi_whitelists(d):
whitelists = d.getVar(
diff --git a/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb b/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb
index 23bd32b..c366685 100644
--- a/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb
+++ b/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb
@@ -5,7 +5,7 @@
inherit native
inherit phosphor-ipmi-host
-inherit pythonnative
+inherit python3native
inherit mrw-xml
DEPENDS += " \
@@ -13,7 +13,7 @@
mrw-perl-tools-native \
phosphor-ipmi-sensor-config-native \
phosphor-ipmi-sensor-inventory-mrw-config-native \
- python-pyyaml-native \
+ ${PYTHON_PN}-pyyaml-native \
"
PROVIDES += "virtual/phosphor-ipmi-sensor-inventory"