side-switch: introduce side switch feature

See the following series for more information on this feature and
testing status:
 https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-bmc-code-mgmt/+/52379

phosphor-bmc-code-mgmt: srcrev bump 703de25c2a..119e5a2c07
Andrew Geissler (7):
      make getproperty a templated function
      side-switch: introduce new bmc update feature
      side-switch: check priority of running image
      side-switch: power off chassis in prep for update
      side-switch: set power restore policy to always-on
      side-switch: request bmc reboot to switch to new image
      side-switch: add service to run side-switch function

Patrick Williams (1):
      sdbusplus: object: don't use 'bool' argument constructor

zamiseck (1):
      Signature Validation : Change Error Thrown

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I5725789f2dc69551fd6dab88af37a858369069da

2 files changed, 7 insertions, 1 deletions

diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc
index e33e768484..f423943332 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;branch=master;protocol=https"
-SRCREV = "703de25c2ac0e215f1ac692ac2ebfd9fe93af380"
+SRCREV = "119e5a2c07b2e87ec2e75c98c06522c76bd59832"
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 cf4a053172..9c71ad3528 100644
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
@@ -15,6 +15,7 @@ SOFTWARE_MGR_PACKAGES = " \
     ${PN}-updater-mmc \
     ${PN}-sync \
     ${PN}-usb \
+    ${PN}-side-switch \
 "
 PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}"
 ALLOW_EMPTY:${PN} = "1"
@@ -30,6 +31,7 @@ PACKAGECONFIG[verify_signature] = " \
     -Dverify-full-signature=disabled"
 PACKAGECONFIG[sync_bmc_files] = "-Dsync-bmc-files=enabled, -Dsync-bmc-files=disabled"
 PACKAGECONFIG[usb_code_update] = "-Dusb-code-update=enabled, -Dusb-code-update=disabled, cli11"
+PACKAGECONFIG[side_switch_on_boot] = "-Dside-switch-on-boot=enabled, -Dside-switch-on-boot=disabled, cli11"
 PACKAGECONFIG[ubifs_layout] = "-Dbmc-layout=ubi"
 PACKAGECONFIG[mmc_layout] = "-Dbmc-layout=mmc"
 PACKAGECONFIG[flash_bios] = "-Dhost-bios-upgrade=enabled, -Dhost-bios-upgrade=disabled"
@@ -77,6 +79,9 @@ FILES:${PN}-usb += "\
     ${base_libdir}/udev/rules.d/70-bmc-usb.rules \
     ${bindir}/phosphor-usb-code-update \
     "
+FILES:${PN}-side-switch += "\
+    ${bindir}/phosphor-bmc-side-switch \
+    "
 DBUS_SERVICE:${PN}-version += "xyz.openbmc_project.Software.Version.service"
 DBUS_SERVICE:${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service"
 DBUS_SERVICE:${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service"
@@ -92,6 +97,7 @@ SYSTEMD_SERVICE:${PN}-updater += " \
 
 SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}"
 SYSTEMD_SERVICE:${PN}-usb += "${@bb.utils.contains('PACKAGECONFIG', 'usb_code_update', 'usb-code-update@.service', '', d)}"
+SYSTEMD_SERVICE:${PN}-side-switch += "${@bb.utils.contains('PACKAGECONFIG', 'side_switch_on_boot', 'phosphor-bmc-side-switch.service', '', d)}"
 SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'static-dual-image', 'obmc-flash-bmc-alt@.service', '', d)}"
 SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'static-dual-image', 'obmc-flash-bmc-static-mount-alt.service', '', d)}"
 SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'static-dual-image', 'obmc-flash-bmc-prepare-for-sync.service', '', d)}"