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.
Change-Id: I7e45f5b57aae98702723753658b44ac56fe515c3
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/classes/phosphor-software-manager-ubi-fs.bbclass b/classes/phosphor-software-manager-ubi-fs.bbclass
index 17b50da..cc1ad37 100644
--- a/classes/phosphor-software-manager-ubi-fs.bbclass
+++ b/classes/phosphor-software-manager-ubi-fs.bbclass
@@ -27,9 +27,6 @@
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/recipes-phosphor/flash/phosphor-software-manager.inc b/recipes-phosphor/flash/phosphor-software-manager.inc
index e7957f0..8bc566f 100644
--- a/recipes-phosphor/flash/phosphor-software-manager.inc
+++ b/recipes-phosphor/flash/phosphor-software-manager.inc
@@ -2,4 +2,4 @@
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/recipes-phosphor/flash/phosphor-software-manager_git.bb b/recipes-phosphor/flash/phosphor-software-manager_git.bb
index 301e4e7..d83945e 100644
--- a/recipes-phosphor/flash/phosphor-software-manager_git.bb
+++ b/recipes-phosphor/flash/phosphor-software-manager_git.bb
@@ -72,7 +72,10 @@
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 \
"