From 4c3d6d3d2ba45bc47e5d676e6396d2cb12e47446 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 26 May 2020 15:31:11 +0000 Subject: phosphor-bmc-code-mgmt: srcrev bump 9155b713ff..0d7198f4eb Adriana Kobylak (2): configure.ac: Set values to support a default configuration meson: Fix compile errors Bright Cheng (1): Add checking ApplyTime for static layout With the new support for ApplyTime on static layout, the reboot service files move from the ubi bbclass to the common BMC updater. (From meta-phosphor rev: b99a1ad6ddcbfc10fac3f23437ea105b542048a1) Change-Id: I6eacdb1a254ee594fda1ba17463afe8a9ec9cbf3 Signed-off-by: Andrew Geissler Signed-off-by: Adriana Kobylak Signed-off-by: Andrew Geissler --- meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass | 3 --- meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc | 2 +- meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass index 17b50da0e..cc1ad3738 100644 --- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass @@ -27,9 +27,6 @@ SYSTEMD_SERVICE_phosphor-software-manager-updater-ubi += " \ obmc-flash-bmc-updateubootvars@.service \ obmc-flash-bmc-cleanup.service \ obmc-flash-bmc-mirroruboot.service \ - reboot-guard-enable.service \ - reboot-guard-disable.service \ - force-reboot.service \ " # Name of the mtd device where the ubi volumes should be created diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index e7957f0b3..8bc566ff4 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "9155b713ff5a29c5a9213c3df4e26e25f7a4170f" +SRCREV = "0d7198f4eb6d36968e854b3246e6568305fdcc7b" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index 301e4e788..d83945ea4 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -72,7 +72,10 @@ DBUS_SERVICE_${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service" DBUS_SERVICE_${PN}-sync += "xyz.openbmc_project.Software.Sync.service" SYSTEMD_SERVICE_${PN}-updater += " \ + force-reboot.service \ obmc-flash-bmc-setenv@.service \ + reboot-guard-disable.service \ + reboot-guard-enable.service \ usr-local.mount \ " -- cgit v1.2.3