diff options
Diffstat (limited to 'meta-openpower/recipes-phosphor')
7 files changed, 9 insertions, 5 deletions
diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service index 6fc3fec82..6826764ff 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector/openpower-debug-collector-watchdog@.service @@ -1,6 +1,7 @@ [Unit] Description=OpenPOWER debug data collector for host watchdog timeout Before=obmc-host-quiesce@%i.target +After=op-stop-instructions@%i.service [Service] ExecStart=/usr/bin/env watchdog_timeout diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index 7b44d7840..eca81d800 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -67,7 +67,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "9cbc06b10d2738f7c2e3472cd447612768739f1d" +SRCREV = "5e0b2375b20ea1e82f95770f68ae416a8c0de62f" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 1a3fde452..a0dd2bab2 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "0ac7c38f64ce2c5a170ab6fe219d26e599713da3" +SRCREV = "db92472533b150dfbe7e60489b47cfc4791ec11c" DEPENDS += " \ phosphor-logging \ diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 9bbba105e..040b26e06 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "04f010abb7946c18d6bb68c714ca6a4417845d8d" +SRCREV = "15527a43fe309d3599d146d5a48607b14b426a37" S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index 93c2ae5bd..e10131436 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control" -SRCREV = "a7b74dc31001884243556e4433d0bbfda3c09083" +SRCREV = "432dc48607223e24250e1fc4fa6fb42456a6db62" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service index d16bcdce7..10ac0ee94 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control/org.open_power.OCC.Control.service @@ -2,6 +2,9 @@ Description=OpenPOWER OCC controller Wants=mapper-wait@-xyz-openbmc_project-inventory.service After=mapper-wait@-xyz-openbmc_project-inventory.service +Wants=obmc-host-reset-running@0.target +After=obmc-host-reset-running@0.target +After=fsi-scan@0.service [Service] ExecStart=/usr/bin/env openpower-occ-control diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index c26dc27f6..3a590a8c8 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "88d2ae82af7fd97086c60fa9e39e0b4ee31a5974" +SRCREV = "26d6c146d265de6f0b6b66baf3951298c0418a67" |