Update to internal 2019-12-16

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

1 files changed, 76 insertions, 0 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0007-Adding-StandBySpare-for-firmware-activation.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0007-Adding-StandBySpare-for-firmware-activation.patch
new file mode 100644
index 000000000..b63226cce
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0007-Adding-StandBySpare-for-firmware-activation.patch
@@ -0,0 +1,76 @@
+From c2ae3ac444f7a5e9674a82f47086874f947bcec6 Mon Sep 17 00:00:00 2001
+From: Vikram Bodireddy <vikram.bodireddy@linux.intel.com>
+Date: Thu, 5 Dec 2019 12:38:21 +0530
+Subject: [PATCH]  Adding StandBySpare for firmware activation
+
+Added new states 'StandBySpare', 'ActivatingAsStandbySpare' for
+firmware activation. If the uploaded firmware image is for
+backup/recovery, then it sets the "StandBySpare" value for
+Activations. When backup/recovery image is in activating state,
+then activations will be set to "ActivatingAsStandbySpare".
+
+Tested:
+Tested using redfish interface.
+Did the GET on "/redfish/v1/UpdateService/FirmwareInventory/<backup image>"
+Response:
+    ....
+    "Status": {
+         "Health": "OK",
+         "HealthRollup": "OK",
+         "State": "StandbySpare"
+    }
+.......
+
+Change-Id: I7f1608fac3196774a6d593b6128d58da3f5c88fc
+Signed-off-by: Vikram Bodireddy <vikram.bodireddy@linux.intel.com>
+---
+ activation.cpp | 22 ++++++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/activation.cpp b/activation.cpp
+index 2966b2f..a098784 100644
+--- a/activation.cpp
++++ b/activation.cpp
+@@ -80,12 +80,16 @@ auto Activation::activation(Activations value) -> Activations
+ {
+ 
+     if ((value != softwareServer::Activation::Activations::Active) &&
+-        (value != softwareServer::Activation::Activations::Activating))
++        (value != softwareServer::Activation::Activations::Activating) &&
++        (value !=
++         softwareServer::Activation::Activations::ActivatingAsStandbySpare))
+     {
+         redundancyPriority.reset(nullptr);
+     }
+ 
+-    if (value == softwareServer::Activation::Activations::Activating)
++    if (value == softwareServer::Activation::Activations::Activating ||
++        value ==
++            softwareServer::Activation::Activations::ActivatingAsStandbySpare)
+     {
+ #ifdef UBIFS_LAYOUT
+         if (rwVolumeCreated == false && roVolumeCreated == false)
+@@ -256,6 +260,20 @@ auto Activation::requestedActivation(RequestedActivations value)
+                 softwareServer::Activation::Activations::Activating);
+         }
+     }
++    else if ((value ==
++              softwareServer::Activation::RequestedActivations::StandbySpare) &&
++             (softwareServer::Activation::requestedActivation() !=
++              softwareServer::Activation::RequestedActivations::StandbySpare))
++    {
++        if ((softwareServer::Activation::activation() ==
++             softwareServer::Activation::Activations::Ready) ||
++            (softwareServer::Activation::activation() ==
++             softwareServer::Activation::Activations::Failed))
++        {
++            Activation::activation(softwareServer::Activation::Activations::
++                                       ActivatingAsStandbySpare);
++        }
++    }
+     return softwareServer::Activation::requestedActivation(value);
+ }
+ 
+-- 
+2.7.4
+