openpower-pnor-code-mgmt: srcrev bump 573552ae8e..bbb5e3bec1
Adriana Kobylak (1):
vpnor: Move clearvolatile services to vpnor
Andrew Geissler (2):
ensure volatile clear waits on dependency
ensure volatile clear occurs after reset check
Also added to this commit is the movement of the service files from
ubi to vpnor (required with the above commits)
Change-Id: I7832377107516fdc25f9983bb7e98ed6b0753347
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
diff --git a/classes/openpower-software-manager-ubi.bbclass b/classes/openpower-software-manager-ubi.bbclass
index dc20d5d..6fd6b68 100644
--- a/classes/openpower-software-manager-ubi.bbclass
+++ b/classes/openpower-software-manager-ubi.bbclass
@@ -8,35 +8,4 @@
obmc-flash-bios-ubipatch.service \
obmc-flash-bios-ubiremount.service \
obmc-flash-bios-cleanup.service \
- obmc-flash-bios-enable-clearvolatile@.service \
- obmc-flash-bios-check-clearvolatile@.service \
"
-
-# To handle warm reboot scenarios, the checking and clearing of
-# the volatile section must occur in both the chassis and host
-# targets
-
-# Host target installation - only clear if going through
-# full host start target
-ENABLE_CLEAR_VOLATILE_TMPL = "obmc-flash-bios-enable-clearvolatile@.service"
-HOST_START_TGTFMT = "obmc-host-start@{0}.target"
-ENABLE_CLEAR_VOLATILE_INSTFMT = "obmc-flash-bios-enable-clearvolatile@{0}.service"
-ENABLE_CLEAR_VOLATILE_START_FMT = "../${ENABLE_CLEAR_VOLATILE_TMPL}:${HOST_START_TGTFMT}.requires/${ENABLE_CLEAR_VOLATILE_INSTFMT}"
-
-CHECK_CLEAR_VOLATILE_TMPL = "obmc-flash-bios-check-clearvolatile@.service"
-HOST_STARTMIN_TGTFMT = "obmc-host-startmin@{0}.target"
-CHECK_CLEAR_VOLATILE_INSTFMT = "obmc-flash-bios-check-clearvolatile@{0}.service"
-CHECK_CLEAR_VOLATILE_START_FMT = "../${CHECK_CLEAR_VOLATILE_TMPL}:${HOST_STARTMIN_TGTFMT}.requires/${CHECK_CLEAR_VOLATILE_INSTFMT}"
-
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}"
-
-# Chassis target installation - always enable and clear in chassis
-# power on
-CHASSIS_PON_TGTFMT = "obmc-chassis-poweron@{0}.target"
-ENABLE_CLEAR_VOLATILE_PON_FMT = "../${ENABLE_CLEAR_VOLATILE_TMPL}:${CHASSIS_PON_TGTFMT}.requires/${ENABLE_CLEAR_VOLATILE_INSTFMT}"
-
-CHECK_CLEAR_VOLATILE_PON_FMT = "../${CHECK_CLEAR_VOLATILE_TMPL}:${CHASSIS_PON_TGTFMT}.requires/${CHECK_CLEAR_VOLATILE_INSTFMT}"
-
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/classes/openpower-software-manager-virtual-pnor.bbclass b/classes/openpower-software-manager-virtual-pnor.bbclass
index c83f4aa..1e76efa 100644
--- a/classes/openpower-software-manager-virtual-pnor.bbclass
+++ b/classes/openpower-software-manager-virtual-pnor.bbclass
@@ -2,4 +2,35 @@
SYSTEMD_SERVICE_${PN} += " \
obmc-vpnor-updatesymlinks.service \
+ obmc-vpnor-check-clearvolatile@.service \
+ obmc-vpnor-enable-clearvolatile@.service \
"
+
+# To handle warm reboot scenarios, the checking and clearing of
+# the volatile section must occur in both the chassis and host
+# targets
+
+# Host target installation - only clear if going through
+# full host start target
+ENABLE_CLEAR_VOLATILE_TMPL = "obmc-vpnor-enable-clearvolatile@.service"
+HOST_START_TGTFMT = "obmc-host-start@{0}.target"
+ENABLE_CLEAR_VOLATILE_INSTFMT = "obmc-vpnor-enable-clearvolatile@{0}.service"
+ENABLE_CLEAR_VOLATILE_START_FMT = "../${ENABLE_CLEAR_VOLATILE_TMPL}:${HOST_START_TGTFMT}.requires/${ENABLE_CLEAR_VOLATILE_INSTFMT}"
+
+CHECK_CLEAR_VOLATILE_TMPL = "obmc-vpnor-check-clearvolatile@.service"
+HOST_STARTMIN_TGTFMT = "obmc-host-startmin@{0}.target"
+CHECK_CLEAR_VOLATILE_INSTFMT = "obmc-vpnor-check-clearvolatile@{0}.service"
+CHECK_CLEAR_VOLATILE_START_FMT = "../${CHECK_CLEAR_VOLATILE_TMPL}:${HOST_STARTMIN_TGTFMT}.requires/${CHECK_CLEAR_VOLATILE_INSTFMT}"
+
+SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}"
+
+# Chassis target installation - always enable and clear in chassis
+# power on
+CHASSIS_PON_TGTFMT = "obmc-chassis-poweron@{0}.target"
+ENABLE_CLEAR_VOLATILE_PON_FMT = "../${ENABLE_CLEAR_VOLATILE_TMPL}:${CHASSIS_PON_TGTFMT}.requires/${ENABLE_CLEAR_VOLATILE_INSTFMT}"
+
+CHECK_CLEAR_VOLATILE_PON_FMT = "../${CHECK_CLEAR_VOLATILE_TMPL}:${CHASSIS_PON_TGTFMT}.requires/${CHECK_CLEAR_VOLATILE_INSTFMT}"
+
+SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/recipes-phosphor/flash/openpower-software-manager_git.bb b/recipes-phosphor/flash/openpower-software-manager_git.bb
index ccb6877..15e2977 100644
--- a/recipes-phosphor/flash/openpower-software-manager_git.bb
+++ b/recipes-phosphor/flash/openpower-software-manager_git.bb
@@ -42,7 +42,7 @@
SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt"
-SRCREV = "573552ae8e3dae3967032def9e1653dfc88676ad"
+SRCREV = "bbb5e3bec1ca0cc073e9096ced453adc23fecffb"
DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service"