diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-03-09 00:45:46 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-03-09 00:45:46 +0300 |
commit | 930df2e58b9725756edbccf99fd4979026fc28fd (patch) | |
tree | 8c5fa9f20219e9bc4580bb18e03b8dd8043a9a4f /meta-phosphor/recipes-phosphor | |
parent | 7c5f8839ec3d71a2170b8f3514a16a67c69d1c7c (diff) | |
parent | 377d8f40e88eeb9ccb1321590a3af3c2caa94dda (diff) | |
download | openbmc-930df2e58b9725756edbccf99fd4979026fc28fd.tar.xz |
Merge tag '0.35' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/recipes-phosphor')
35 files changed, 124 insertions, 73 deletions
diff --git a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb new file mode 100644 index 000000000..3f641f056 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb @@ -0,0 +1,30 @@ +HOMEPAGE = "https://github.com/openbmc/bios-settings-mgr" + +SUMMARY = "Remote BIOS Configuration via BMC" + +DESCRIPTION = "Provides ability for the user to view and modify the BIOS setup \ + configuration parameters remotely via BMC at any Host state. \ + Modifications to the parameters take place upon the next system \ + reboot or immediate based on the host firmware." + +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bcd9ada3a943f58551867d72893cc9ab" + +SRC_URI = "git://github.com/openbmc/bios-settings-mgr" +SRCREV = "c0f926d6cbf9636a42f4bc3d33b9602e4633c478" + +inherit meson pkgconfig systemd + +S = "${WORKDIR}/git" +SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.biosconfig_manager.service \ + xyz.openbmc_project.biosconfig_password.service" + +DEPENDS = " boost \ + phosphor-dbus-interfaces \ + phosphor-logging \ + sdbusplus \ + systemd \ + nlohmann-json " + diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 439756f8f..e8ed237ff 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 file://blocklist.json" -SRCREV = "c76af0fb1defcc9cc3d000c1ca7592d0f01df2a1" +SRCREV = "f094125cd3bdbc8737dc8035a6e9ac252f6e8840" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 0e2b551d3..ca72fadc8 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "e1693dabac7dbbf6424f982faa125f4e2e643ba3" +SRCREV = "6f8ebc58ebe13e97522a7d1740690dde1adadaa8" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service index 4bd411e75..4fad8fad7 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service @@ -4,19 +4,9 @@ Wants=obmc-mapper.target After=obmc-mapper.target [Service] -# We are using a Type=simple service instead of the normal Type=oneshot -# since Type=oneshot can't have Restart= lines -# https://github.com/systemd/systemd/issues/2582 -# Unfortunately Type=oneshot services halt any services which order after -# the oneshot on the completion of ExecStart= lines. For Type=simple, the -# halting is only until ExecStartPre lines have completed and ExecStart has -# begun executing. Since we want to wait for the `mapper wait` process to -# finish, it must be an ExecStartPre. All Type=simple services require an -# ExecStart so we use `true` as a placeholder to satisfy the requirement. -Type=simple +Type=oneshot RemainAfterExit=no Restart=on-failure TimeoutStartSec=infinity -ExecStartPre=/usr/bin/env mapper subtree-remove %I -ExecStart=/usr/bin/env true +ExecStart=/usr/bin/env mapper subtree-remove %I SyslogIdentifier=mapper diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service index f7744e2d8..d61309097 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service @@ -4,19 +4,9 @@ Wants=obmc-mapper.target After=obmc-mapper.target [Service] -# We are using a Type=simple service instead of the normal Type=oneshot -# since Type=oneshot can't have Restart= lines -# https://github.com/systemd/systemd/issues/2582 -# Unfortunately Type=oneshot services halt any services which order after -# the oneshot on the completion of ExecStart= lines. For Type=simple, the -# halting is only until ExecStartPre lines have completed and ExecStart has -# begun executing. Since we want to wait for the `mapper wait` process to -# finish, it must be an ExecStartPre. All Type=simple services require an -# ExecStart so we use `true` as a placeholder to satisfy the requirement. -Type=simple +Type=oneshot RemainAfterExit=yes Restart=on-failure TimeoutStartSec=infinity -ExecStartPre=/usr/bin/env mapper wait %I -ExecStart=/usr/bin/env true +ExecStart=/usr/bin/env mapper wait %I SyslogIdentifier=mapper diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index e1c98f546..e6548ae22 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "8b9b4690a4460ada5bf60a285ff6065eda6d5d4a" +SRCREV = "24e0c5910af87fac22c08dd61d2315cd98c56fcd" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index 8d74f39e0..cca5d629e 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -181,8 +181,8 @@ PACKAGECONFIG[ubifs-workaround] = " \ -Dubifs-workaround=disabled \ " -PACKAGECONFIG[host-dump-offload-pldm] = " \ - -Dhost-dump-offload-transport=pldm,, \ +PACKAGECONFIG[host-dump-transport-pldm] = " \ + -Dhost-transport=pldm,, \ pldm \ " diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index ab86aec0f..b54465e1a 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "8e1b382122fed73e788d44f3a67cecbfbcc6972e" +SRCREV = "23f8757eda6a18f6da10fc0f9e07080467462ea9" diff --git a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb index c858d5b4b..c51a66ffb 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -20,7 +20,7 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-host-postd" -SRCREV = "bf002b46d5fb2f176fb22e48c6f1172bc970e17d" +SRCREV = "c80e59fefb265eba9108bcf1356627b181c00926" SNOOP_DEVICE ?= "aspeed-lpc-snoop0" POST_CODE_BYTES ?= "1" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb index 2d9137705..38b1c2d42 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb @@ -8,7 +8,3 @@ inherit obmc-phosphor-image # The /etc/version file is misleading and not useful. Remove it. # Users should instead rely on /etc/os-release. ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; " - -# Disable the pager to prevent systemd injecting control characters into the -# output stream that are not interpreted by busybox tools. -ROOTFS_POSTPROCESS_COMMAND += "disable_systemd_pager ; " diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index 63908a145..76515fae0 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -48,10 +48,6 @@ inherit obmc-phosphor-image # Users should instead rely on /etc/os-release. ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; " -# Disable the pager to prevent systemd injecting control characters into the -# output stream that are not interpreted by busybox tools. -ROOTFS_POSTPROCESS_COMMAND += "disable_systemd_pager ; " - # The shadow recipe provides the binaries(like useradd, usermod) needed by the # phosphor-user-manager. ROOTFS_RO_UNNEEDED_remove = "shadow" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 120f14a31..cd5aa1e8f 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 = "9e319cf0c5ee714cdd879a1d2a6e5b5ac96c7f1d" +SRCREV = "a90daf182891521fcc7c3e99ba266e6a55d4b4dd" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc index 8490bab67..49c624725 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-inventory-manager" -SRCREV = "84b99d990c98897df049493eb73aa41b9b9b7adb" +SRCREV = "ee294d6838edbe88bd2e6e76184f4127b7cd8218" 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 ea9bdea06..227e8c897 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 = "c7c941d9a35c90729d8aa2a227a96f4eb2be1227" +SRCREV = "485e54aea3f7b084b4425d83d2f5eb9529c09ebe" 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-ethstats_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb index 6985a2617..9af52eb1b 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 = "75ca0187b1082683bd5663725dde02c465b0fc2c" +SRCREV = "6b48b92e08abba4e7b31d69c9a74b1d262718a84" 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 aba705610..05ccd7b24 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -17,6 +17,7 @@ DEPENDS += "sdbusplus" DEPENDS += "systemd" DEPENDS += "ipmi-blob-tool" DEPENDS += "pciutils" +DEPENDS += "function2" PACKAGECONFIG ?= "cleanup-delete" PACKAGECONFIG[cleanup-delete] = "--enable-cleanup-delete, --disable-cleanup-delete" @@ -45,7 +46,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "c78bfc823049e96522eaab333d74d16c7efd6917" +SRCREV = "84904b97d4952a4f48ace53db67d314efcb02be5" 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 9ff34c495..f6c697828 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 = "c0fe0c6b49ee14fc56a59573666e7d8c5eb197b1" +SRCREV = "687e9b034734935fc09e59e47f98423688e783bd" 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 c3028ab73..489d09014 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 = "3e07b9ea353b794f9ef666172265ecc056e5cd4d" +SRCREV = "8fe0abe6d9f69f735e93d7055687fce4b56e80bf" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb new file mode 100644 index 000000000..b086a0a36 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif.bb @@ -0,0 +1,24 @@ +SUMMARY = "Phosphor OpenBMC SSIF to DBUS" +DESCRIPTION = "Phosphor OpenBMC SSIF to DBUS." +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit meson pkgconfig +inherit systemd + +SYSTEMD_SERVICE_${PN} = "ssifbridge.service" + +PROVIDES += "virtual/obmc-host-ipmi-hw" +RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" +RRECOMMENDS_${PN} += "phosphor-ipmi-host" + +DEPENDS += "systemd" +DEPENDS += "phosphor-logging" +DEPENDS += "sdbusplus" +DEPENDS += "cli11" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/openbmc/ssifbridge.git;protocol=git;branch=master" +SRCREV= "f624941f501e2ddd1f2d4518dbdbd3642560f610" + diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 838c60a14..5b3edc699 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-led-manager" -SRCREV = "4c5f53371272641f27b584530e594883fcd447ef" +SRCREV = "19c48e17a089379edeb61aeb5b560fa18bd6eb83" diff --git a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb index 5c8f8aebc..f6ee824a8 100644 --- a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb @@ -3,8 +3,7 @@ DESCRIPTION = "Command line tool to collect and tar up debug data" PR = "r1" PV = "1.0+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +require recipes-phosphor/dump/phosphor-debug-collector.inc DEPENDS += "systemd" @@ -13,9 +12,6 @@ RDEPENDS_${PN} += " \ " S = "${WORKDIR}/git" -SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" - -SRCREV = "8b9b4690a4460ada5bf60a285ff6065eda6d5d4a" do_install() { install -d ${D}${bindir} diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 72beb6d17..3e0b84174 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -55,7 +55,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "f10068d397f4613b526394afbae245087caacb9d" +SRCREV = "e7d271ae7ecf460b9c4b76caf9ba555f7d8a532e" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb b/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb index 7e7a55869..e698a9cb0 100644 --- a/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb +++ b/meta-phosphor/recipes-phosphor/mctp/mctp_git.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" SRC_URI = "git://github.com/openbmc/libmctp \ file://default" -SRCREV = "b9fd597ca42b290a97a259d2d5a089981c25e72c" +SRCREV = "b4ae00b9f822f1d136f4684e039057521a30ac47" CONFFILES_${PN} = "${sysconfdir}/default/mctp" DEPENDS += "autoconf-archive-native \ diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index b6ef7d807..14d8ea881 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "5dad5f4ca475d5b8848b2925a51353d1619739a2" +SRCREV = "6a7ec0c11d20842800c8540d510aa9354813de7e" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb index 1c07ad59d..e6ac942bd 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb +++ b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb @@ -32,6 +32,11 @@ pkg_postinst_${PN} () { TARGET="../pldmSoftPowerOff.service" ln -s $TARGET $LINK + mkdir -p $D$systemd_system_unitdir/obmc-host-quiesce@0.target.wants + LINK="$D$systemd_system_unitdir/obmc-host-quiesce@0.target.wants/pldmSoftPowerOff.service" + TARGET="../pldmSoftPowerOff.service" + ln -s $TARGET $LINK + mkdir -p $D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/pldmSoftPowerOff.service" TARGET="../pldmSoftPowerOff.service" @@ -43,6 +48,9 @@ pkg_prerm_${PN} () { LINK="$D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires/pldmSoftPowerOff.service" rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-quiesce@0.target.wants/pldmSoftPowerOff.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/pldmSoftPowerOff.service" rm $LINK } diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 69f3ba824..fe7d3bba2 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "9564e9451cf21903582c6b21b5a6d5cec4357bef" +SRCREV = "589c181a345406e5764084aa177e0616e212b44f" diff --git a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb index 37d67f8a6..ec8fcdc18 100644 --- a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb +++ b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS += "systemd sdbusplus boost phosphor-ipmi-host" SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=git" -SRCREV = "df7bc1c6951fb7dd2776008aa0b7dc6bea44bed4" +SRCREV = "e526b86d7f9eef3b7a58f2800263666a04051239" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 64e5b25a8..727bad533 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 = "832a2c604956a2e37da9acedb32ebc8f6d9abae1" +SRCREV = "a3e8f2a391f389ffb2c379ca0c181e67de43824e" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb index ed32f379c..26c674c0a 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" SRC_URI = "git://github.com/openbmc/phosphor-nvme.git;protocol=git" -SRCREV = "9b771e221e3854bbbf45a56bbcab97c62b0a05ec" +SRCREV = "93455337cbf9b005e761c15bd90bdbe6b13484b8" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.nvme.manager.service" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb index 93c001453..adcfdecfe 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -16,7 +16,7 @@ DEPENDS += "nlohmann-json" DEPENDS += "exprtk" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=git" -SRCREV = "26edaad467a44ff9b69968ac0912aa3e9e3d0a62" +SRCREV = "fdb826d5a434c4db6ee202f4d36611d744f327ea" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "phosphor-virtual-sensor.service" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb index 9d08084d4..075e06c3c 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb @@ -15,10 +15,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit cmake pkgconfig systemd -SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.State.Boot.PostCode.service" + +def get_service(d): + if(d.getVar('OBMC_HOST_INSTANCES') == '0'): + return "xyz.openbmc_project.State.Boot.PostCode.service" + else: + return " ".join(["xyz.openbmc_project.State.Boot.PostCode@{}.service".format(x) for x in d.getVar('OBMC_HOST_INSTANCES').split()]) + +SYSTEMD_SERVICE_${PN} = "${@get_service(d)}" DEPENDS += " \ sdbusplus \ phosphor-dbus-interfaces \ phosphor-logging \ " + +FILES_${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.State.Boot.PostCode@.service" +FILES_${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.State.Boot.PostCode.service" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc index 6c12da8c4..2c01dea63 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc @@ -18,6 +18,16 @@ pkg_postinst_${PN}-obmc-targets_append() { TARGET="../phosphor-reset-host-reboot-attempts@.service" ln -s $TARGET $LINK + mkdir -p $D$systemd_system_unitdir/obmc-host-startmin@0.target.wants + LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.wants/phosphor-set-host-transition-to-running@0.service" + TARGET="../phosphor-set-host-transition-to-running@.service" + ln -s $TARGET $LINK + + mkdir -p $D$systemd_system_unitdir/obmc-host-stop@0.target.wants + LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/phosphor-set-host-transition-to-off@0.service" + TARGET="../phosphor-set-host-transition-to-off@.service" + ln -s $TARGET $LINK + mkdir -p $D$systemd_system_unitdir/obmc-host-reset@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/phosphor-reset-host-check@0.service" TARGET="../phosphor-reset-host-check@.service" @@ -73,11 +83,6 @@ pkg_postinst_${PN}-obmc-targets_append() { TARGET="../obmc-host-force-warm-reboot@.target" ln -s $TARGET $LINK - mkdir -p $D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires - LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/obmc-host-force-warm-reboot@0.target" - TARGET="../obmc-host-force-warm-reboot@.target" - ln -s $TARGET $LINK - mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/phosphor-clear-one-time@0.service" TARGET="../phosphor-clear-one-time@.service" @@ -98,6 +103,12 @@ pkg_prerm_${PN}-obmc-targets_append() { LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phosphor-reset-host-reboot-attempts@0.service" rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.wants/phosphor-set-host-transition-to-running@0.service" + rm $LINK + + LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/phosphor-set-host-transition-to-off@0.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/phosphor-reset-host-check@0.service" rm $LINK @@ -134,9 +145,6 @@ pkg_prerm_${PN}-obmc-targets_append() { LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/obmc-host-force-warm-reboot@0.target" rm $LINK - LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/obmc-host-force-warm-reboot@0.target" - rm $LINK - LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/phosphor-clear-one-time@0.service" rm $LINK } diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 8e74e69a0..580cf433d 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -59,6 +59,8 @@ DBUS_SERVICE_${PN}-host += "xyz.openbmc_project.State.Host.service" DBUS_SERVICE_${PN}-host += "phosphor-reboot-host@.service" SYSTEMD_SERVICE_${PN}-host += "phosphor-reset-host-reboot-attempts@.service" SYSTEMD_SERVICE_${PN}-host += "phosphor-clear-one-time@.service" +SYSTEMD_SERVICE_${PN}-host += "phosphor-set-host-transition-to-running@.service" +SYSTEMD_SERVICE_${PN}-host += "phosphor-set-host-transition-to-off@.service" FILES_${PN}-chassis = "${bindir}/phosphor-chassis-state-manager" DBUS_SERVICE_${PN}-chassis += "xyz.openbmc_project.State.Chassis.service" @@ -146,7 +148,7 @@ HOST_LINK_ACTION_FMT = "${HOST_ACTION_FMT}:obmc-host-{0}@{1}.target" FAN_LINK_FMT = "obmc-fan-control-ready@.target:obmc-fan-control-ready@{0}.target" # Targets to be executed on checkstop and watchdog timeout -HOST_ERROR_TARGETS = "crash timeout" +HOST_ERROR_TARGETS = "timeout" QUIESCE_TMPL = "obmc-host-quiesce@.target" CRASH_TIMEOUT_TGTFMT = "obmc-host-{0}@{1}.target" @@ -174,6 +176,6 @@ SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHA SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "bbbc01655243fecc83f8734f12a57e665b90ff9a" +SRCREV = "1e8b164f7b575f9728dd7f46d7b2d27e6081ee3f" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 6d95c7a09..f580fa62f 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "bc766b4d8bb2a33a3c8540a4d7c21fb6cda5d104" +SRCREV = "982c5b5b1ebe368329f6a1a95a8893b03953cb9b" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 4ef9579b1..163727394 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "645250b918ccc1d3965824a1c259d0367f6691b1" +SRCREV = "2ec04fbb915a2d3428312288a282008c138a9a62" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " |