Merge tag 'wht-0.53' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

13 files changed, 37 insertions, 22 deletions

diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
index 8de43d28f..2d8b49105 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
@@ -14,6 +14,7 @@ SRC_URI = " \
     file://channel_access.json \
     file://channel_config.json \
     file://entity-map.json \
+    file://cs_privilege_levels.json \
     "
 
 FILES_${PN} = " \
@@ -25,6 +26,7 @@ FILES_${PN} = " \
     ${datadir}/ipmi-providers/channel_access.json \
     ${datadir}/ipmi-providers/channel_config.json \
     ${datadir}/ipmi-providers/entity-map.json \
+    ${datadir}/ipmi-providers/cs_privilege_levels.json \
     "
 
 do_fetch[noexec] = "1"
@@ -50,4 +52,6 @@ do_install() {
         ${D}${datadir}/ipmi-providers/channel_config.json
     install -m 0644 -D ${WORKDIR}/entity-map.json \
         ${D}${datadir}/ipmi-providers/entity-map.json
+    install -m 0644 -D ${WORKDIR}/cs_privilege_levels.json \
+        ${D}${datadir}/ipmi-providers/cs_privilege_levels.json
 }
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json
index 767fc708c..049ded062 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json
@@ -1,10 +1,4 @@
 {
-    "a":{
-        "cipher":3,
-        "authentication":1,
-        "integrity":1,
-        "confidentiality":1
-    },
     "b":{
         "cipher":17,
         "authentication":3,
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cs_privilege_levels.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cs_privilege_levels.json
new file mode 100644
index 000000000..15a3cdddf
--- /dev/null
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cs_privilege_levels.json
@@ -0,0 +1 @@
+{"Channel0":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel1":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel10":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel11":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel12":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel13":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel14":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel15":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel2":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel3":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel4":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel5":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel6":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel7":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel8":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel9":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"}}
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb
index 40254b3fe..d8a170474 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb
@@ -45,7 +45,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}"
 
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash"
-SRCREV = "79fc7c0680ebb0d5399eab83230b3d047dc8eb82"
+SRCREV = "01593f96589c0381599e2feaa2981eb8ede9728f"
 
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc
index 1e85b9354..ef91bb9e9 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser"
 LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c"
 SRC_URI += "git://github.com/openbmc/ipmi-fru-parser"
-SRCREV = "686da1839e3416f0edf48dacb4c0e0d13daa8a16"
+SRCREV = "0968237b479d649ecaac7561cf07fbacf241d98c"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
index ae8c0388e..1486cace0 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service
@@ -7,6 +7,7 @@ After=mapper-wait@-xyz-openbmc_project-inventory.service
 Restart=no
 Type=oneshot
 EnvironmentFile={envfiledir}/obmc/eeproms/%I
+ExecStartPre={bindir}/of-name-to-eeprom.sh {envfiledir}/obmc/eeproms/%I
 ExecStart=/usr/bin/env phosphor-read-eeprom --eeprom $SYSFS_PATH --fruid $FRUID
 SyslogIdentifier=phosphor-read-eeprom
 
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/of-name-to-eeprom.sh b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/of-name-to-eeprom.sh
new file mode 100755
index 000000000..40c489613
--- /dev/null
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/of-name-to-eeprom.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -eu
+[ -n "${OF_NAME+1}" ] || exit 0
+path="$(grep -xl "$OF_NAME" /sys/bus/i2c/devices/*/of_node/name)"
+eeprom="${path%/of_node/name}/eeprom"
+sed -i "s,^SYSFS_PATH=.*$,SYSFS_PATH=$eeprom," "$1"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
index d79078a1b..4ee1e16a3 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
@@ -7,17 +7,17 @@ inherit autotools pkgconfig
 inherit obmc-phosphor-systemd
 inherit obmc-phosphor-ipmiprovider-symlink
 inherit phosphor-ipmi-fru
-inherit pythonnative
+inherit python3native
 
-require ${PN}.inc
+require ${BPN}.inc
 
 DEPENDS += " \
         virtual/phosphor-ipmi-fru-inventory \
         virtual/phosphor-ipmi-fru-properties \
         systemd \
         sdbusplus \
-        python-mako-native \
-        python-pyyaml-native \
+        ${PYTHON_PN}-mako-native \
+        ${PYTHON_PN}-pyyaml-native \
         phosphor-ipmi-host \
         phosphor-mapper \
         autoconf-archive-native \
@@ -25,12 +25,17 @@ DEPENDS += " \
         cli11 \
         "
 
+RDEPENDS_${PN} += "bash"
+
+SRC_URI += "file://of-name-to-eeprom.sh"
+
 SYSTEMD_SERVICE_${PN} += "obmc-read-eeprom@.service"
 
 S = "${WORKDIR}/git"
 
 HOSTIPMI_PROVIDER_LIBRARY += "libstrgfnhandler.so"
 
+FILES_${PN} += "${bindir}/of-name-to-eeprom.sh"
 FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
 FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
 FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
@@ -39,3 +44,8 @@ EXTRA_OECONF = " \
              YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/config.yaml \
              PROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/extra-properties.yaml \
              "
+
+do_install_append() {
+        install -d ${D}${bindir}
+        install -m 0755 ${WORKDIR}/of-name-to-eeprom.sh ${D}${bindir}
+}
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
index 8babca20b..9c304afb0 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 = "0e2dbee2d19ee6865d6e95b07398943b8f536336"
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 a59e1fdd0..56df13bdd 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(
@@ -29,7 +29,7 @@ DEPENDS += "phosphor-dbus-interfaces"
 DEPENDS += "phosphor-logging"
 DEPENDS += "phosphor-mapper"
 DEPENDS += "sdbusplus"
-DEPENDS += "sdbus++-native"
+DEPENDS += "${PYTHON_PN}-sdbus++-native"
 DEPENDS += "virtual/phosphor-ipmi-inventory-sel"
 DEPENDS += "virtual/phosphor-ipmi-fru-merge-config"
 DEPENDS += "virtual/phosphor-ipmi-sensor-inventory"
@@ -60,10 +60,10 @@ GROUPADD_PARAM_${PN} = "ipmi"
 
 SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service phosphor-ipmi-host.service"
 
-RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-settings-mgmt}"
+RRECOMMENDS_${PN} += "phosphor-settings-manager"
 
 
-require ${PN}.inc
+require ${BPN}.inc
 
 # Setup IPMI Whitelist Conf files
 WHITELIST_CONF = " \
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
index 99f5830cf..fb489acd5 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
@@ -16,7 +16,7 @@ DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-host"
 
 SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid"
-SRCREV = "2555e2ec1c5bd6636eb67a1a2cdf6b8b567772c9"
+SRCREV = "9979e9971e17c974f29ec9ab720f5482308c119c"
 
 S = "${WORKDIR}/git"
 
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"