diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-02 22:06:48 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-02 22:06:48 +0300 |
| commit | 9600a7403ba2848c8751280077503a3e0f2f3481 (patch) | |
| tree | 996726918f255cc9686dec34628fab410ac8f550 /meta-phosphor/recipes-phosphor/ipmi | |
| parent | b11bad1ba28f79c08266efb9cc265d89103e5939 (diff) | |
| parent | 5ec7af7413906b500cce396255bde69c9770f6d8 (diff) | |
| download | openbmc-9600a7403ba2848c8751280077503a3e0f2f3481.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/recipes-phosphor/ipmi')
7 files changed, 7 insertions, 7 deletions
diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend index 5f25f5dbb..d52f33038 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend @@ -13,6 +13,6 @@ SRC_URI += " \ S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=9aa91e13d644326bf281924212862184" -EXTRA_OECONF_append = " --enable-intf-dbus DEFAULT_INTF=dbus " +EXTRA_OECONF_append = " --disable-ipmishell --enable-intf-dbus DEFAULT_INTF=dbus " PV = "1.8.18+git${SRCPV}" 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 534e4ec7e..40254b3fe 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 = "2aa55347312c400f9dd61a32c8c1e37b1691bb1c" +SRCREV = "79fc7c0680ebb0d5399eab83230b3d047dc8eb82" 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 3fe720113..1e85b9354 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 = "2cdb0e3fb478bc19eddcf3f919bef10188634d49" +SRCREV = "686da1839e3416f0edf48dacb4c0e0d13daa8a16" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 8a15732e8..cd4139af3 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 = "4a15685ee852d0b0ee0981d3d1a2a9dd55130835" +SRCREV = "86d8bd793968e9251f41dbb8eaea482490e68eb1" 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 e41da0be3..6bd95e86f 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -23,7 +23,7 @@ def ipmi_whitelists(d): DEPENDS += "autoconf-archive-native" DEPENDS += "nlohmann-json" -DEPENDS += "obmc-targets" +DEPENDS += "phosphor-state-manager" DEPENDS += "${@ipmi_whitelists(d)}" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "phosphor-logging" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb index 2bd4bd766..26617a911 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The IPMB bridge implements a Dbus compliant interface for \ implementing IPMB interfaces" SRC_URI = "git://github.com/openbmc/ipmbbridge.git" -SRCREV = "43c89138ea759b4e47f6cef481f677b9f421d148" +SRCREV = "a86059348fe133725f4616f3e46ff0d555db4039" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" 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 ab93f7a42..99f5830cf 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 = "46bec0f60a201a644c1f3af4cec2f31da58a0595" +SRCREV = "2555e2ec1c5bd6636eb67a1a2cdf6b8b567772c9" S = "${WORKDIR}/git" |