diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-04 23:00:20 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-06 17:42:18 +0300 |
commit | b3f2d73624f3013dd9218cca7b262c9dca2b0fd4 (patch) | |
tree | f303b67130714ab8932d1f1d30079b43fb577cf5 /meta-phosphor | |
parent | 3046e17687a11a899a6e2f7f9a756c60d4702ca6 (diff) | |
download | openbmc-b3f2d73624f3013dd9218cca7b262c9dca2b0fd4.tar.xz |
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>
Diffstat (limited to 'meta-phosphor')
9 files changed, 10 insertions, 10 deletions
diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass index d690c7f0d..1f649821e 100644 --- a/meta-phosphor/classes/phosphor-networkd-rev.bbclass +++ b/meta-phosphor/classes/phosphor-networkd-rev.bbclass @@ -1,2 +1,2 @@ SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "74db23cf883c6eb9d1f10aaff57b9cc167cb0868" +SRCREV = "35297177b81061c3ac6658412c6306556849790a" diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index ec09ad2e8..cfb130893 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "b69602b8771dd6cffe47da06612d07395e0b3698" +SRCREV = "61c25c07ca78d68bf0718a98b8a12ff68bdd4239" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb index 7c93b0e0f..ec189bd90 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb @@ -38,7 +38,7 @@ RDEPENDS_${PN} += " \ " SRC_URI += "git://github.com/openbmc/phosphor-objmgr" -SRCREV = "6a39e8c727efb53b5902904d932c6308eb7f393e" +SRCREV = "47c09755e5a7e4c998ed9c4e82d82f7ee5cd6f43" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index d63c40e64..eb2a2a4a8 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "99ad5995089bace233dac20de28ef021591d89c1" +SRCREV = "3112a144b3d47b8927ef1ad0eaa2094c7fbb96fe" S = "${WORKDIR}/git" 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 973c3cf36..67c3cc8b0 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 @@ DEPENDS += "phosphor-logging" 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 e83faf392..ee41b24ea 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 = "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 26a0db6a4..692b21e0f 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 @@ SUMMARY = "Phosphor OpenBMC KCS to DBUS" 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 @@ PV = "1.0+git${SRCPV}" 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" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb index 2f61ee17d..e011a5a90 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb @@ -12,7 +12,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/phosphor-snmp" -SRCREV = "bbee5d0d8f6fd7ac2d66e537b9aaead03027e0f6" +SRCREV = "9d18e562853f522d12fcdfeea59436a848b66c50" DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.SNMP.service" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index f5c9e17f1..c3b94ccd8 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "95b079b785b5db5da502db28f25d989c2ccaf12e" +SRCREV = "f87dc4c139a72a900944d4d8bf9b719685a3ce43" PV = "0.1+git${SRCPV}" |