diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor/ipmi')
12 files changed, 21 insertions, 18 deletions
diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index f871088df..23f14eb63 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -14,4 +14,4 @@ EXTRA_OECONF = "--disable-tests" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ipmi-blob-tool" -SRCREV = "00f39b84037a840a1b169a8017be75ac6636cb6f" +SRCREV = "bae76647e7e5967a9e1a9729d7a74148f4b4a9ac" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb index 4d973f6e8..8f1d34b58 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb @@ -17,7 +17,7 @@ DEPENDS += "protobuf" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs-binarystore" -SRCREV = "1a25e0d16ea5cb79d0942193bed92ac7dd287112" +SRCREV = "c3abe753fca211f49eb68f7d34e37bfc9eb5d4c4" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" 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 7d62fc7fc..2f9d7c184 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb @@ -16,7 +16,7 @@ DEPENDS += "ipmi-blob-tool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs" -SRCREV = "03fd5b8b9e8fc0eb7f77c1a170fd2c0018ab9e63" +SRCREV = "99f25beb8cfb8a6704f2648ec47f066907403e55" 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-config/channel_config.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json index 7f26c247e..3b54d0c6c 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json @@ -165,7 +165,7 @@ } }, "15" : { - "name" : "SMS", + "name" : "ipmi_kcs3", "is_valid" : true, "active_sessions" : 0, "channel_info" : { diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb index 0b6701efd..6985a2617 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb @@ -14,7 +14,7 @@ DEPENDS += "phosphor-ipmi-host" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-ethstats" -SRCREV = "7a1b2033e8cce2fe711d8a033885d9048325332d" +SRCREV = "75ca0187b1082683bd5663725dde02c465b0fc2c" 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-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 5c8acc685..27c668985 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 = "6f61af8fd125400d064715559cfffba92afaecf6" +SRCREV = "85e54f1bf6867cb53723be1196da28225b6525d3" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 8a2e98f91..7f9c29ad4 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 = "3dc3558944da95b8b288fa1afc3aaa96d273383d" +SRCREV = "515bc375cb8daaee981bae97fa7ae80e7bf65c62" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service index 600c86ac2..a3222a950 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service @@ -2,10 +2,11 @@ Description=Soft power off of the host Wants=mapper-wait@-org-openbmc-HostIpmi-1.service After=mapper-wait@-org-openbmc-HostIpmi-1.service -Wants=obmc-host-stopping@0.target -Before=obmc-host-stopping@0.target +Wants=obmc-host-stop-pre@0.target +Before=obmc-host-stop-pre@0.target Conflicts=obmc-host-start@0.target ConditionPathExists=!/run/openbmc/host@0-request +ConditionPathExists=!/lib/systemd/system/pldmSoftPowerOff.service [Service] Restart=no 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 26617a911..c3028ab73 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 = "a86059348fe133725f4616f3e46ff0d555db4039" +SRCREV = "3e07b9ea353b794f9ef666172265ecc056e5cd4d" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" @@ -17,6 +17,6 @@ DEPENDS = "sdbusplus \ boost \ nlohmann-json" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" inherit cmake systemd FILES_${PN} += "/usr/share/ipmbbridge/ipmb-channels.json" 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 15d08efce..a4d4b4bb2 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb @@ -30,4 +30,4 @@ DEPENDS += " \ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/kcsbridge.git" -SRCREV = "58d596ad9625790b5e06804360aa161579364425" +SRCREV = "4a4d1d03d99fabe089e649aa226ad4c61e71684e" 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 b622f833e..b18ea0136 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -15,8 +15,10 @@ DEPENDS += "phosphor-mapper" DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-host" +RRECOMMENDS_${PN} = "pam-ipmi" + SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "9d9b7638cb1e95989329680730ec272da786615f" +SRCREV = "07bb095158b39cedb49dae0972e489a6a2776faf" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml index 8188612b3..44caf9e4b 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml @@ -271,7 +271,7 @@ cpucore_temp_sensor: Value: Offsets: 0xFF: - type: int64_t + type: double dimm_temp_sensor: serviceInterface: org.freedesktop.DBus.Properties @@ -289,7 +289,7 @@ dimm_temp_sensor: Value: Offsets: 0xFF: - type: int64_t + type: double vrm_vdd_temp_sensor: serviceInterface: org.freedesktop.DBus.Properties @@ -307,7 +307,7 @@ vrm_vdd_temp_sensor: Value: Offsets: 0xFF: - type: int64_t + type: double gpu_temp_sensor: serviceInterface: org.freedesktop.DBus.Properties @@ -325,7 +325,7 @@ gpu_temp_sensor: Value: Offsets: 0xFF: - type: int64_t + type: double memory_temp_sensor: serviceInterface: org.freedesktop.DBus.Properties @@ -343,7 +343,7 @@ memory_temp_sensor: Value: Offsets: 0xFF: - type: int64_t + type: double ps_derating_sensor: serviceInterface: org.freedesktop.DBus.Properties readingType: assertion |