Update to internal 0.72

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

5 files changed, 87 insertions, 112 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-support-for-StandBySpare.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-support-for-StandBySpare.patch
index 46e94e339..3895424ac 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-support-for-StandBySpare.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-support-for-StandBySpare.patch
@@ -1,6 +1,6 @@
-From 461da7ec950704a1f5bcc7f6527ed8ca119cfaf9 Mon Sep 17 00:00:00 2001
+From 98c57392535227f1906fdc2d6f65980267b5d97c Mon Sep 17 00:00:00 2001
 From: Vikram Bodireddy <vikram.bodireddy@intel.com>
-Date: Tue, 24 Mar 2020 16:05:32 +0530
+Date: Tue, 30 Jun 2020 21:47:55 +0530
 Subject: [PATCH] Firmware update support for StandBySpare
 
 Firmware update support for StandBySpare. This will
@@ -28,38 +28,38 @@ Tested:
 
 Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
 ---
- redfish-core/lib/update_service.hpp | 274 +++++++++++++++++++++++++++++++-----
- 1 file changed, 241 insertions(+), 33 deletions(-)
+ redfish-core/lib/update_service.hpp | 276 ++++++++++++++++++++++++----
+ 1 file changed, 243 insertions(+), 33 deletions(-)
 
 diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
-index e9793eb..a913bac 100644
+index 8dae2fb..86ddd8a 100644
 --- a/redfish-core/lib/update_service.hpp
 +++ b/redfish-core/lib/update_service.hpp
-@@ -30,6 +30,17 @@ static std::unique_ptr<sdbusplus::bus::match::match> fwUpdateMatcher;
+@@ -32,6 +32,17 @@ static std::unique_ptr<sdbusplus::bus::match::match> fwUpdateErrorMatcher;
  static bool fwUpdateInProgress = false;
  // Timer for software available
  static std::unique_ptr<boost::asio::steady_timer> fwAvailableTimer;
-+static constexpr const char *versionIntf =
++static constexpr const char* versionIntf =
 +    "xyz.openbmc_project.Software.Version";
-+static constexpr const char *activationIntf =
++static constexpr const char* activationIntf =
 +    "xyz.openbmc_project.Software.Activation";
-+static constexpr const char *reqActivationPropName = "RequestedActivation";
-+static constexpr const char *reqActivationsActive =
++static constexpr const char* reqActivationPropName = "RequestedActivation";
++static constexpr const char* reqActivationsActive =
 +    "xyz.openbmc_project.Software.Activation.RequestedActivations.Active";
-+static constexpr const char *reqActivationsStandBySpare =
++static constexpr const char* reqActivationsStandBySpare =
 +    "xyz.openbmc_project.Software.Activation.RequestedActivations.StandbySpare";
-+static constexpr const char *activationsStandBySpare =
++static constexpr const char* activationsStandBySpare =
 +    "xyz.openbmc_project.Software.Activation.Activations.StandbySpare";
  
  static void cleanUp()
  {
-@@ -37,27 +48,119 @@ static void cleanUp()
-     fwUpdateMatcher = nullptr;
+@@ -40,27 +51,119 @@ static void cleanUp()
+     fwUpdateErrorMatcher = nullptr;
  }
- static void activateImage(const std::string &objPath,
--                          const std::string &service)
-+                          const std::string &service,
-+                          const std::vector<std::string> &imgUriTargets)
+ static void activateImage(const std::string& objPath,
+-                          const std::string& service)
++                          const std::string& service,
++                          const std::vector<std::string>& imgUriTargets)
  {
      BMCWEB_LOG_DEBUG << "Activate image for " << objPath << " " << service;
 +    // If targets is empty, it will apply to the active.
@@ -90,7 +90,7 @@ index e9793eb..a913bac 100644
 -            if (error_code)
 +        [objPath, service, imgTarget{imgUriTargets[0]}](
 +            const boost::system::error_code ec,
-+            const crow::openbmc_mapper::GetSubTreeType &subtree) {
++            const crow::openbmc_mapper::GetSubTreeType& subtree) {
 +            if (ec || !subtree.size())
              {
 -                BMCWEB_LOG_DEBUG << "error_code = " << error_code;
@@ -98,7 +98,7 @@ index e9793eb..a913bac 100644
 +                return;
 +            }
 +
-+            for (const auto &[invObjPath, invDict] : subtree)
++            for (const auto& [invObjPath, invDict] : subtree)
 +            {
 +                std::size_t idPos = invObjPath.rfind("/");
 +                if ((idPos == std::string::npos) ||
@@ -173,23 +173,23 @@ index e9793eb..a913bac 100644
 +        "xyz.openbmc_project.ObjectMapper",
 +        "/xyz/openbmc_project/object_mapper",
 +        "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/",
-+        static_cast<int32_t>(0), std::array<const char *, 1>{versionIntf});
++        static_cast<int32_t>(0), std::array<const char*, 1>{versionIntf});
  }
  
  // Note that asyncResp can be either a valid pointer or nullptr. If nullptr
  // then no asyncResp updates will occur
  static void softwareInterfaceAdded(std::shared_ptr<AsyncResp> asyncResp,
 +                                   const std::vector<std::string> imgUriTargets,
-                                    sdbusplus::message::message &m,
-                                    const crow::Request &req)
+                                    sdbusplus::message::message& m,
+                                    const crow::Request& req)
  {
-@@ -70,25 +173,27 @@ static void softwareInterfaceAdded(std::shared_ptr<AsyncResp> asyncResp,
+@@ -73,25 +176,27 @@ static void softwareInterfaceAdded(std::shared_ptr<AsyncResp> asyncResp,
  
      m.read(objPath, interfacesProperties);
  
 -    BMCWEB_LOG_DEBUG << "obj path = " << objPath.str;
 +    BMCWEB_LOG_DEBUG << "Software Interface Added. obj path = " << objPath.str;
-     for (auto &interface : interfacesProperties)
+     for (auto& interface : interfacesProperties)
      {
          BMCWEB_LOG_DEBUG << "interface = " << interface.first;
  
@@ -205,7 +205,7 @@ index e9793eb..a913bac 100644
 +                [objPath, asyncResp, imgTargets{imgUriTargets},
                   req](const boost::system::error_code error_code,
                        const std::vector<std::pair<
-                           std::string, std::vector<std::string>>> &objInfo) {
+                           std::string, std::vector<std::string>>>& objInfo) {
                      if (error_code)
                      {
 -                        BMCWEB_LOG_DEBUG << "error_code = " << error_code;
@@ -215,7 +215,7 @@ index e9793eb..a913bac 100644
                          BMCWEB_LOG_DEBUG << "error msg = "
                                           << error_code.message();
                          if (asyncResp)
-@@ -115,7 +220,7 @@ static void softwareInterfaceAdded(std::shared_ptr<AsyncResp> asyncResp,
+@@ -118,7 +223,7 @@ static void softwareInterfaceAdded(std::shared_ptr<AsyncResp> asyncResp,
                      // is added
                      fwAvailableTimer = nullptr;
  
@@ -224,13 +224,13 @@ index e9793eb..a913bac 100644
                      if (asyncResp)
                      {
                          std::shared_ptr<task::TaskData> task =
-@@ -196,17 +301,16 @@ static void softwareInterfaceAdded(std::shared_ptr<AsyncResp> asyncResp,
+@@ -248,18 +353,17 @@ static void softwareInterfaceAdded(std::shared_ptr<AsyncResp> asyncResp,
                  "xyz.openbmc_project.ObjectMapper",
                  "/xyz/openbmc_project/object_mapper",
                  "xyz.openbmc_project.ObjectMapper", "GetObject", objPath.str,
--                std::array<const char *, 1>{
+-                std::array<const char*, 1>{
 -                    "xyz.openbmc_project.Software.Activation"});
-+                std::array<const char *, 1>{activationIntf});
++                std::array<const char*, 1>{activationIntf});
          }
      }
  }
@@ -238,28 +238,30 @@ index e9793eb..a913bac 100644
  // Note that asyncResp can be either a valid pointer or nullptr. If nullptr
  // then no asyncResp updates will occur
 -static void monitorForSoftwareAvailable(std::shared_ptr<AsyncResp> asyncResp,
--                                        const crow::Request &req,
+-                                        const crow::Request& req,
+-                                        const std::string& url,
 -                                        int timeoutTimeSeconds = 5)
 +static void monitorForSoftwareAvailable(
-+    std::shared_ptr<AsyncResp> asyncResp, const crow::Request &req,
-+    const std::vector<std::string> &imgUriTargets, int timeoutTimeSeconds = 5)
++    std::shared_ptr<AsyncResp> asyncResp, const crow::Request& req,
++    const std::string& url, const std::vector<std::string>& imgUriTargets,
++    int timeoutTimeSeconds = 5)
  {
      // Only allow one FW update at a time
      if (fwUpdateInProgress != false)
-@@ -246,9 +350,10 @@ static void monitorForSoftwareAvailable(std::shared_ptr<AsyncResp> asyncResp,
+@@ -299,9 +403,10 @@ static void monitorForSoftwareAvailable(std::shared_ptr<AsyncResp> asyncResp,
              }
          });
  
--    auto callback = [asyncResp, req](sdbusplus::message::message &m) {
+-    auto callback = [asyncResp, req](sdbusplus::message::message& m) {
 +    auto callback = [asyncResp, imgTargets{imgUriTargets},
-+                     req](sdbusplus::message::message &m) {
++                     req](sdbusplus::message::message& m) {
          BMCWEB_LOG_DEBUG << "Match fired";
 -        softwareInterfaceAdded(asyncResp, m, req);
 +        softwareInterfaceAdded(asyncResp, imgTargets, m, req);
      };
  
      fwUpdateInProgress = true;
-@@ -358,9 +463,12 @@ class UpdateServiceActionsSimpleUpdate : public Node
+@@ -467,12 +572,15 @@ class UpdateServiceActionsSimpleUpdate : public Node
          std::string fwFile = imageURI.substr(separator + 1);
          BMCWEB_LOG_DEBUG << "Server: " << tftpServer + " File: " << fwFile;
  
@@ -268,32 +270,35 @@ index e9793eb..a913bac 100644
 +
          // Setup callback for when new software detected
          // Give TFTP 2 minutes to complete
--        monitorForSoftwareAvailable(nullptr, req, 120);
-+        monitorForSoftwareAvailable(nullptr, req, httpUriTargets, 120);
+         monitorForSoftwareAvailable(
+             nullptr, req,
+             "/redfish/v1/UpdateService/Actions/UpdateService.SimpleUpdate",
+-            120);
++            httpUriTargets, 120);
  
          // TFTP can take up to 2 minutes depending on image size and
          // connection speed. Return to caller as soon as the TFTP operation
-@@ -394,7 +502,8 @@ class UpdateServiceActionsSimpleUpdate : public Node
+@@ -506,7 +614,8 @@ class UpdateServiceActionsSimpleUpdate : public Node
  class UpdateService : public Node
  {
    public:
--    UpdateService(CrowApp &app) : Node(app, "/redfish/v1/UpdateService/")
-+    UpdateService(CrowApp &app) :
+-    UpdateService(CrowApp& app) : Node(app, "/redfish/v1/UpdateService/")
++    UpdateService(CrowApp& app) :
 +        Node(app, "/redfish/v1/UpdateService/"), httpPushUriTargetBusy(false)
      {
          entityPrivileges = {
              {boost::beast::http::verb::get, {{"Login"}}},
-@@ -406,6 +515,9 @@ class UpdateService : public Node
+@@ -518,6 +627,9 @@ class UpdateService : public Node
      }
  
    private:
 +    std::vector<std::string> httpPushUriTargets;
 +    bool httpPushUriTargetBusy;
 +
-     void doGet(crow::Response &res, const crow::Request &req,
-                const std::vector<std::string> &params) override
+     void doGet(crow::Response& res, const crow::Request& req,
+                const std::vector<std::string>& params) override
      {
-@@ -416,6 +528,8 @@ class UpdateService : public Node
+@@ -528,6 +640,8 @@ class UpdateService : public Node
          res.jsonValue["Description"] = "Service for Software Update";
          res.jsonValue["Name"] = "Update Service";
          res.jsonValue["HttpPushUri"] = "/redfish/v1/UpdateService";
@@ -302,7 +307,7 @@ index e9793eb..a913bac 100644
          // UpdateService cannot be disabled
          res.jsonValue["ServiceEnabled"] = true;
          res.jsonValue["FirmwareInventory"] = {
-@@ -475,9 +589,14 @@ class UpdateService : public Node
+@@ -587,9 +701,14 @@ class UpdateService : public Node
          std::shared_ptr<AsyncResp> asyncResp = std::make_shared<AsyncResp>(res);
  
          std::optional<nlohmann::json> pushUriOptions;
@@ -319,7 +324,7 @@ index e9793eb..a913bac 100644
              return;
          }
  
-@@ -545,6 +664,98 @@ class UpdateService : public Node
+@@ -657,6 +776,98 @@ class UpdateService : public Node
                  }
              }
          }
@@ -370,7 +375,7 @@ index e9793eb..a913bac 100644
 +                            }
 +
 +                            bool swInvObjFound = false;
-+                            for (const std::string &path : swInvPaths)
++                            for (const std::string& path : swInvPaths)
 +                            {
 +                                std::size_t idPos = path.rfind("/");
 +                                if ((idPos == std::string::npos) ||
@@ -402,7 +407,7 @@ index e9793eb..a913bac 100644
 +                        "/xyz/openbmc_project/object_mapper",
 +                        "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths",
 +                        "/", static_cast<int32_t>(0),
-+                        std::array<const char *, 1>{versionIntf});
++                        std::array<const char*, 1>{versionIntf});
 +                }
 +                else
 +                {
@@ -417,27 +422,28 @@ index e9793eb..a913bac 100644
 +        }
      }
  
-     void doPost(crow::Response &res, const crow::Request &req,
-@@ -555,7 +766,7 @@ class UpdateService : public Node
+     void doPost(crow::Response& res, const crow::Request& req,
+@@ -667,8 +878,8 @@ class UpdateService : public Node
          std::shared_ptr<AsyncResp> asyncResp = std::make_shared<AsyncResp>(res);
  
          // Setup callback for when new software detected
--        monitorForSoftwareAvailable(asyncResp, req);
-+        monitorForSoftwareAvailable(asyncResp, req, httpPushUriTargets);
+-        monitorForSoftwareAvailable(asyncResp, req,
+-                                    "/redfish/v1/UpdateService");
++        monitorForSoftwareAvailable(asyncResp, req, "/redfish/v1/UpdateService",
++                                    httpPushUriTargets);
  
          std::string filepath(
              "/tmp/images/" +
-@@ -641,8 +852,7 @@ class SoftwareInventoryCollection : public Node
+@@ -754,7 +965,7 @@ class SoftwareInventoryCollection : public Node
              "/xyz/openbmc_project/object_mapper",
              "xyz.openbmc_project.ObjectMapper", "GetSubTree",
              "/xyz/openbmc_project/software", static_cast<int32_t>(0),
--            std::array<const char *, 1>{
--                "xyz.openbmc_project.Software.Version"});
-+            std::array<const char *, 1>{versionIntf});
+-            std::array<const char*, 1>{"xyz.openbmc_project.Software.Version"});
++            std::array<const char*, 1>{versionIntf});
      }
  };
  
-@@ -825,7 +1035,7 @@ class SoftwareInventory : public Node
+@@ -937,7 +1148,7 @@ class SoftwareInventory : public Node
                          },
                          obj.second[0].first, obj.first,
                          "org.freedesktop.DBus.Properties", "GetAll",
@@ -446,17 +452,16 @@ index e9793eb..a913bac 100644
                  }
                  if (!found)
                  {
-@@ -846,9 +1056,7 @@ class SoftwareInventory : public Node
+@@ -958,8 +1169,7 @@ class SoftwareInventory : public Node
              "xyz.openbmc_project.ObjectMapper",
              "/xyz/openbmc_project/object_mapper",
              "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/",
 -            static_cast<int32_t>(0),
--            std::array<const char *, 1>{
--                "xyz.openbmc_project.Software.Version"});
-+            static_cast<int32_t>(0), std::array<const char *, 1>{versionIntf});
+-            std::array<const char*, 1>{"xyz.openbmc_project.Software.Version"});
++            static_cast<int32_t>(0), std::array<const char*, 1>{versionIntf});
      }
  };
  
 -- 
-2.7.4
+2.17.1
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0002-Use-chip-id-based-UUID-for-Service-Root.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0002-Use-chip-id-based-UUID-for-Service-Root.patch
index 03c27fb43..e963b1423 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0002-Use-chip-id-based-UUID-for-Service-Root.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0002-Use-chip-id-based-UUID-for-Service-Root.patch
@@ -1,7 +1,10 @@
-From d629bf86a9ac970d8c0505c0aa2488373c9df102 Mon Sep 17 00:00:00 2001
+From b68d62ddf0a9d77a287a7e9a99762915e31d02b9 Mon Sep 17 00:00:00 2001
 From: Wiktor Golgowski <wiktor.golgowski@linux.intel.com>
 Date: Thu, 30 Apr 2020 11:09:35 +0200
 Subject: [PATCH] Use chip id-based UUID for Service Root.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 If the sysfs-provided chip id is available, it will be used as
 payload to generate Service Root UUID from hardcoded namespace.
@@ -12,15 +15,16 @@ If the sysfs node is not available, code falls back to randomly
 generated UUID.
 
 Signed-off-by: Wiktor Gołgowski <wiktor.golgowski@linux.intel.com>
+
 ---
- include/persistent_data_middleware.hpp | 32 +++++++++++++++++++++++---
+ include/persistent_data_middleware.hpp | 32 +++++++++++++++++++++++++++++---
  1 file changed, 29 insertions(+), 3 deletions(-)
 
 diff --git a/include/persistent_data_middleware.hpp b/include/persistent_data_middleware.hpp
-index 348079b..925e7b6 100644
+index de3a6ba..a20b213 100644
 --- a/include/persistent_data_middleware.hpp
 +++ b/include/persistent_data_middleware.hpp
-@@ -30,6 +30,10 @@ class Middleware
+@@ -31,6 +31,10 @@ class Middleware
    public:
      // todo(ed) should read this from a fixed location somewhere, not CWD
      static constexpr const char* filename = "bmcweb_persistent_data.json";
@@ -30,8 +34,8 @@ index 348079b..925e7b6 100644
 +    "944847ed76f5}";
  
      struct Context
-     {
-@@ -143,9 +147,31 @@ class Middleware
+     {};
+@@ -141,9 +145,31 @@ class Middleware
  
          if (systemUuid.empty())
          {
@@ -66,6 +70,3 @@ index 348079b..925e7b6 100644
          }
          if (fileRevision < jsonRevision)
          {
--- 
-2.20.1
-
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Temporarily-disable-EventService-log-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Temporarily-disable-EventService-log-support.patch
deleted file mode 100644
index bfa843e73..000000000
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-Temporarily-disable-EventService-log-support.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From cd173b21c42456bde9765e7f6164e495b6c6a303 Mon Sep 17 00:00:00 2001
-From: James Feist <james.feist@linux.intel.com>
-Date: Wed, 3 Jun 2020 10:08:05 -0700
-Subject: [PATCH 1/1] Temporarily disable EventService log support
-
-This is causing bmcweb to crash when there is no
-redfish log.
-
-Change-Id: Id53e57f1ca140ee44f69fec46fd63bec18490c99
-Signed-off-by: James Feist <james.feist@linux.intel.com>
----
- src/webserver_main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp
-index ea32122..421cd1d 100644
---- a/src/webserver_main.cpp
-+++ b/src/webserver_main.cpp
-@@ -116,7 +116,7 @@ int main(int argc, char** argv)
- 
-     redfish::RedfishService redfish(app);
- 
--#ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES
-+#if 0
-     int rc = redfish::EventServiceManager::startEventLogMonitor(*io);
-     if (rc)
-     {
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-bmcweb-changes-for-setting-ApplyOptions-ClearCfg.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-bmcweb-changes-for-setting-ApplyOptions-ClearCfg.patch
index 844a65ec9..704031fe1 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-bmcweb-changes-for-setting-ApplyOptions-ClearCfg.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0003-bmcweb-changes-for-setting-ApplyOptions-ClearCfg.patch
@@ -1,6 +1,6 @@
-From 4d88fcada1d95f485ea5a1dd418b31c508652712 Mon Sep 17 00:00:00 2001
+From e883ea9d43a84998641428448d7220c0f5be72c0 Mon Sep 17 00:00:00 2001
 From: Vikram Bodireddy <vikram.bodireddy@intel.com>
-Date: Fri, 15 May 2020 21:12:44 +0530
+Date: Tue, 30 Jun 2020 22:09:10 +0530
 Subject: [PATCH] bmcweb changes for setting ApplyOptions-ClearCfg
 
 ApplyOptions are used to specify firmware update specific options
@@ -25,10 +25,10 @@ Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
  create mode 100644 static/redfish/v1/schema/OemUpdateService_v1.xml
 
 diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
-index a913bac..3a64e63 100644
+index 86ddd8a..291acec 100644
 --- a/redfish-core/lib/update_service.hpp
 +++ b/redfish-core/lib/update_service.hpp
-@@ -579,6 +579,29 @@ class UpdateService : public Node
+@@ -691,6 +691,29 @@ class UpdateService : public Node
              "/xyz/openbmc_project/software/apply_time",
              "org.freedesktop.DBus.Properties", "Get",
              "xyz.openbmc_project.Software.ApplyTime", "RequestedApplyTime");
@@ -44,7 +44,7 @@ index a913bac..3a64e63 100644
 +                    return;
 +                }
 +
-+                const bool *b = std::get_if<bool>(&applyOption);
++                const bool* b = std::get_if<bool>(&applyOption);
 +
 +                if (b)
 +                {
@@ -57,8 +57,8 @@ index a913bac..3a64e63 100644
 +            "Get", "xyz.openbmc_project.Software.ApplyOptions", "ClearConfig");
      }
  
-     void doPatch(crow::Response &res, const crow::Request &req,
-@@ -591,15 +614,59 @@ class UpdateService : public Node
+     void doPatch(crow::Response& res, const crow::Request& req,
+@@ -703,15 +726,59 @@ class UpdateService : public Node
          std::optional<nlohmann::json> pushUriOptions;
          std::optional<std::vector<std::string>> imgTargets;
          std::optional<bool> imgTargetBusy;
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
index a1ce5f99b..5c70f25d7 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -1,6 +1,6 @@
 # todo(james) remove nobranch
 SRC_URI = "git://github.com/openbmc/bmcweb.git"
-SRCREV = "dc3fbbd0b0021ae888a97bf48a62f30129fc3f4d"
+SRCREV = "a502de3d661acf95613d4e4d27c9611f2c8148ea"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
@@ -12,7 +12,6 @@ GROUPADD_PARAM_${PN} = "web; redfish "
 
 SRC_URI += "file://0001-Firmware-update-support-for-StandBySpare.patch \
             file://0002-Use-chip-id-based-UUID-for-Service-Root.patch \
-            file://0003-Temporarily-disable-EventService-log-support.patch \
             file://0003-bmcweb-changes-for-setting-ApplyOptions-ClearCfg.patch \
 "