meta-phosphor: master refresh 632923e49c..65f8850b66
Update meta-phosphor to master HEAD.
Andrew Geissler (8):
bmcweb: srcrev bump 99ad599508..3112a144b3
phosphor-networkd: srcrev bump 74db23cf88..35297177b8
phosphor-objmgr: srcrev bump 6a39e8c727..47c09755e5
entity-manager: srcrev bump b69602b877..61c25c07ca
dbus-sensors: srcrev bump 95b079b785..f87dc4c139
phosphor-snmp: srcrev bump bbee5d0d8f..9d18e56285
phosphor-host-ipmid: srcrev bump 77ff3fe596..e04c004b21
phosphor-ipmi-blobs: srcrev bump 50539d3646..9e0c1af678
Yong Li (2):
Fix incorrect license type
Do not use DBUS_SERVICES in the systemd string substitutions
Change-Id: I3f170aee1b5d0e0ab5f040c6a13d39274fdedfc2
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb
index 973c3cf..67c3cc8 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb
@@ -15,7 +15,7 @@
S = "${WORKDIR}/git"
SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs"
-SRCREV = "50539d364648834e5c0fac6bceef00646b4fde5d"
+SRCREV = "9e0c1af678fe5330360bee07da188b998ce8e241"
FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
index e83faf3..ee41b24 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 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
-SRCREV = "77ff3fe596532f965d86691f20031babcede775d"
+SRCREV = "e04c004b21ede91a1feca00fc72ea54279e1abfb"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
index 26a0db6..692b21e 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
@@ -2,7 +2,7 @@
DESCRIPTION = "Phosphor OpenBMC KCS to DBUS."
PR = "r1"
-LICENSE = "MIT"
+LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b1beb00e508e89da1ed2a541934f28c0"
inherit autotools pkgconfig
@@ -13,7 +13,7 @@
KCS_DEVICE ?= "ipmi-kcs3"
DBUS_SERVICE_${PN} = "org.openbmc.HostIpmi.service"
-SYSTEMD_SUBSTITUTIONS += "KCS_DEVICE:${KCS_DEVICE}:${DBUS_SERVICE_${PN}}"
+SYSTEMD_SUBSTITUTIONS += "KCS_DEVICE:${KCS_DEVICE}:org.openbmc.HostIpmi.service"
PROVIDES += "virtual/obmc-host-ipmi-hw"
RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw"