diff options
| author | Andrew Geissler <openbmcbump-github@yahoo.com> | 2020-03-30 17:31:19 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-01 16:35:54 +0300 |
| commit | 04b85e9f7cb38c97af7b30d45f912c48183f06e0 (patch) | |
| tree | 2ec5ff34eb20cebd1cf4565799cfb74cb8ed319e | |
| parent | cb8ef5c36612f9c2eb0451de04f813372df40862 (diff) | |
| download | openbmc-04b85e9f7cb38c97af7b30d45f912c48183f06e0.tar.xz | |
phosphor-host-ipmid: Move to python3
Bump the revision and use python3native
(From meta-phosphor rev: 06fe96971a3201fc1f263f1ef5208e7b699604bb)
Change-Id: Ia715f3b14f48a3430b8c0bb3257d3a274af7129a
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
4 files changed, 6 insertions, 6 deletions
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 8babca20b..3ec3270ec 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" 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/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py index 877e3eb57..928e8bdef 100755 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py +++ b/meta-phosphor/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 @@ def dict_merge(target, source): """ 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/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index fdf6f1794..1f82e757d 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -12,7 +12,7 @@ inherit obmc-phosphor-ipmiprovider-symlink 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/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb index 23bd32b45..c3666857c 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit native inherit phosphor-ipmi-host -inherit pythonnative +inherit python3native inherit mrw-xml DEPENDS += " \ @@ -13,7 +13,7 @@ DEPENDS += " \ 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" |