Update to internal

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

5 files changed, 323 insertions, 4 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0002-Redfish-firmware-activation.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0002-Redfish-firmware-activation.patch
new file mode 100644
index 000000000..2a4c7e9b6
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0002-Redfish-firmware-activation.patch
@@ -0,0 +1,44 @@
+From b6b3051c8078267153712ed8cf514373924fd07a Mon Sep 17 00:00:00 2001
+From: Jennifer Lee <jennifer1.lee@intel.com>
+Date: Mon, 16 Jul 2018 19:15:04 -0700
+Subject: [PATCH 2/6] Redfish firmware activation  -- Modified flash.cpp to
+ call to customized flash service
+
+Signed-off-by: Jennifer Lee <jennifer1.lee@intel.com>
+Change-Id: I81c3185e9c4c2ee907feeb53620faa22723c04d4
+---
+ ubi/flash.cpp | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/ubi/flash.cpp b/ubi/flash.cpp
+index ffa9348..5af2a17 100644
+--- a/ubi/flash.cpp
++++ b/ubi/flash.cpp
+@@ -15,10 +15,13 @@ void Activation::flashWrite()
+ {
+     auto method = bus.new_method_call(SYSTEMD_BUSNAME, SYSTEMD_PATH,
+                                       SYSTEMD_INTERFACE, "StartUnit");
+-    method.append("obmc-flash-bmc-ubirw.service", "replace");
++    std::string rwServiceFile =
++        "obmc-flash-bmc-ubirw@" + versionId + ".service";
++    method.append(rwServiceFile, "replace");
+     bus.call_noreply(method);
+ 
+-    auto roServiceFile = "obmc-flash-bmc-ubiro@" + versionId + ".service";
++    std::string roServiceFile =
++        "obmc-flash-bmc-ubiro@" + versionId + ".service";
+     method = bus.new_method_call(SYSTEMD_BUSNAME, SYSTEMD_PATH,
+                                  SYSTEMD_INTERFACE, "StartUnit");
+     method.append(roServiceFile, "replace");
+@@ -37,7 +40,7 @@ void Activation::onStateChanges(sdbusplus::message::message& msg)
+     // Read the msg and populate each variable
+     msg.read(newStateID, newStateObjPath, newStateUnit, newStateResult);
+ 
+-    auto rwServiceFile = "obmc-flash-bmc-ubirw.service";
++    auto rwServiceFile = "obmc-flash-bmc-ubirw@" + versionId + ".service";
+     auto roServiceFile = "obmc-flash-bmc-ubiro@" + versionId + ".service";
+     auto ubootVarsServiceFile =
+         "obmc-flash-bmc-updateubootvars@" + versionId + ".service";
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0004-Changed-the-condition-of-software-version-service-wa.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0004-Changed-the-condition-of-software-version-service-wa.patch
new file mode 100644
index 000000000..3fc3907ba
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0004-Changed-the-condition-of-software-version-service-wa.patch
@@ -0,0 +1,41 @@
+From 1b00440d0c8fabfa2e3eda984a21c0f004ca2150 Mon Sep 17 00:00:00 2001
+From: Jennifer Lee <jennifer1.lee@intel.com>
+Date: Fri, 26 Oct 2018 11:54:05 -0700
+Subject: [PATCH 4/6] Changed the condition of software version service
+ watching deamon
+
+	Originally it watches only files that are "written" into /tmp/images directory.
+This change modified the condition to also watch files that are "moved" into this directory.
+
+Signed-off-by: Jennifer Lee <jennifer1.lee@intel.com>
+Change-Id: I3e9cf1ffc3f5350d4649d32d3d3837991322a65b
+---
+ watch.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/watch.cpp b/watch.cpp
+index e46b8aa..eee1bc3 100644
+--- a/watch.cpp
++++ b/watch.cpp
+@@ -45,7 +45,7 @@ Watch::Watch(sd_event* loop, std::function<int(std::string&)> imageCallback) :
+                                  std::strerror(error));
+     }
+ 
+-    wd = inotify_add_watch(fd, IMG_UPLOAD_DIR, IN_CLOSE_WRITE);
++    wd = inotify_add_watch(fd, IMG_UPLOAD_DIR, IN_CLOSE_WRITE | IN_MOVED_TO);
+     if (-1 == wd)
+     {
+         auto error = errno;
+@@ -96,7 +96,8 @@ int Watch::callback(sd_event_source* s, int fd, uint32_t revents,
+     while (offset < bytes)
+     {
+         auto event = reinterpret_cast<inotify_event*>(&buffer[offset]);
+-        if ((event->mask & IN_CLOSE_WRITE) && !(event->mask & IN_ISDIR))
++        if ((event->mask & (IN_CLOSE_WRITE | IN_MOVED_TO)) &&
++            !(event->mask & IN_ISDIR))
+         {
+             auto tarballPath = std::string{IMG_UPLOAD_DIR} + '/' + event->name;
+             auto rc = static_cast<Watch*>(userdata)->imageCallback(tarballPath);
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0005-Modified-firmware-activation-to-launch-fwupd.sh-thro.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0005-Modified-firmware-activation-to-launch-fwupd.sh-thro.patch
new file mode 100644
index 000000000..aa5d900e0
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0005-Modified-firmware-activation-to-launch-fwupd.sh-thro.patch
@@ -0,0 +1,188 @@
+From 7f29c255dd2af7fa6d38b02ad63a8b8940fbce84 Mon Sep 17 00:00:00 2001
+From: Jennifer Lee <jennifer1.lee@intel.com>
+Date: Mon, 10 Dec 2018 10:36:44 -0800
+Subject: [PATCH 5/6] Modified firmware activation to launch fwupd.sh through
+ non-ubi fs code path to match more closely to the upstream design 	-
+ Added option FWUPD_SCRIPT to saperate intel customized code 	- Adopted
+ ActivationProgress from ubi fs activation code mainly for progress indicator
+ for ipmi update
+
+Signed-off-by: Jennifer Lee <jennifer1.lee@intel.com>
+Change-Id: Id805deea75b21fab86f6bb6edbf50ddb3be42564
+---
+ activation.cpp   | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac     |  7 +++++++
+ static/flash.cpp | 41 +++++++++++++++++++++++++++++++++++++++--
+ ubi/flash.cpp    |  9 +++------
+ 4 files changed, 93 insertions(+), 8 deletions(-)
+
+diff --git a/activation.cpp b/activation.cpp
+index f918221..f2923ae 100644
+--- a/activation.cpp
++++ b/activation.cpp
+@@ -163,6 +163,50 @@ auto Activation::activation(Activations value) -> Activations
+                     softwareServer::Activation::Activations::Active);
+             }
+         }
++#elif defined(FWUPD_SCRIPT)
++        if (!activationProgress)
++        {
++            // Enable systemd signals
++            Activation::subscribeToSystemdSignals();
++            parent.freeSpace(*this);
++
++            activationProgress =
++                std::make_unique<ActivationProgress>(bus, path);
++
++#ifdef WANT_SIGNATURE_VERIFY
++            fs::path uploadDir(IMG_UPLOAD_DIR);
++            if (!verifySignature(uploadDir / versionId, SIGNED_IMAGE_CONF_PATH))
++            {
++                onVerifyFailed();
++                // Stop the activation process, if fieldMode is enabled.
++                if (parent.control::FieldMode::fieldModeEnabled())
++                {
++                    return softwareServer::Activation::activation(
++                        softwareServer::Activation::Activations::Failed);
++                }
++            }
++#endif
++            flashWrite();
++            activationProgress->progress(10);
++        }
++        else if (activationProgress->progress() == 100)
++        {
++            log<level::ERR>("[Jennifer] progress == 100...");
++            if (!redundancyPriority)
++            {
++                redundancyPriority =
++                    std::make_unique<RedundancyPriority>(bus, path, *this, 0);
++            }
++
++            // Remove version object from image manager
++            Activation::deleteImageManagerObject();
++
++            // Create active association
++            parent.createActiveAssociation(path);
++
++            return softwareServer::Activation::activation(
++                softwareServer::Activation::Activations::Active);
++        }
+ #else // !UBIFS_LAYOUT
+ 
+ #ifdef WANT_SIGNATURE_VERIFY
+diff --git a/configure.ac b/configure.ac
+index 2da97ad..720e704 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -184,6 +184,13 @@ AS_IF([test "x$enable_ubifs_layout" == "xyes"], \
+     [AC_DEFINE([UBIFS_LAYOUT],[],[Enable ubifs support.])])
+ AM_CONDITIONAL([UBIFS_LAYOUT], [test "x$enable_ubifs_layout" == "xyes"])
+ 
++# setup fwupd script support
++AC_ARG_ENABLE([fwupd_script],
++    AS_HELP_STRING([--enable-fwupd_script], [Enable fwupd script support.]))
++AS_IF([test "x$enable_fwupd_script" == "xyes"], \
++    [AC_DEFINE([FWUPD_SCRIPT],[],[Enable fwupd script support.])])
++AM_CONDITIONAL([FWUPD_SCRIPT], [test "x$enable_fwupd_script" == "xyes"])
++
+ # Check for header files.
+ AC_CHECK_HEADER(systemd/sd-bus.h, ,[AC_MSG_ERROR([Could not find systemd/sd-bus.h...systemd development package required])])
+ AC_CHECK_HEADER(sdbusplus/server.hpp, ,[AC_MSG_ERROR([Could not find sdbusplus/server.hpp...openbmc/sdbusplus package required])])
+diff --git a/static/flash.cpp b/static/flash.cpp
+index 82c2393..1bf29d5 100644
+--- a/static/flash.cpp
++++ b/static/flash.cpp
+@@ -20,9 +20,11 @@ namespace updater
+ {
+ 
+ namespace fs = std::experimental::filesystem;
++namespace softwareServer = sdbusplus::xyz::openbmc_project::Software::server;
+ 
+ void Activation::flashWrite()
+ {
++#ifndef FWUPD_SCRIPT
+     // For static layout code update, just put images in /run/initramfs.
+     // It expects user to trigger a reboot and an updater script will program
+     // the image to flash during reboot.
+@@ -33,11 +35,46 @@ void Activation::flashWrite()
+         fs::copy_file(uploadDir / versionId / bmcImage, toPath / bmcImage,
+                       fs::copy_options::overwrite_existing);
+     }
++
++#else
++    auto method = bus.new_method_call(SYSTEMD_BUSNAME, SYSTEMD_PATH,
++                                      SYSTEMD_INTERFACE, "StartUnit");
++    method.append("fwupd@" + versionId + ".service", "replace");
++    bus.call_noreply(method);
++#endif
+ }
+ 
+-void Activation::onStateChanges(sdbusplus::message::message& /*msg*/)
++void Activation::onStateChanges(sdbusplus::message::message& msg)
+ {
+-    // Empty
++#ifndef FWUPD_SCRIPT
++    uint32_t newStateID{};
++    sdbusplus::message::object_path newStateObjPath;
++    std::string newStateUnit{};
++    std::string newStateResult{};
++
++    msg.read(newStateID, newStateObjPath, newStateUnit, newStateResult);
++
++    auto rwServiceFile = "fwupdw@" + versionId + ".service";
++
++    if (newStateUnit == rwServiceFile && newStateResult == "done")
++    {
++        activationProgress->progress(100);
++    }
++
++    if (newStateUnit == rwServiceFile)
++    {
++        if (newStateResult == "failed" || newStateResult == "dependency")
++        {
++            Activation::activation(
++                softwareServer::Activation::Activations::Failed);
++        }
++        else
++        {
++            Activation::activation(
++                softwareServer::Activation::Activations::Activating);
++        }
++    }
++#endif
+ }
+ 
+ } // namespace updater
+diff --git a/ubi/flash.cpp b/ubi/flash.cpp
+index 5af2a17..ffa9348 100644
+--- a/ubi/flash.cpp
++++ b/ubi/flash.cpp
+@@ -15,13 +15,10 @@ void Activation::flashWrite()
+ {
+     auto method = bus.new_method_call(SYSTEMD_BUSNAME, SYSTEMD_PATH,
+                                       SYSTEMD_INTERFACE, "StartUnit");
+-    std::string rwServiceFile =
+-        "obmc-flash-bmc-ubirw@" + versionId + ".service";
+-    method.append(rwServiceFile, "replace");
++    method.append("obmc-flash-bmc-ubirw.service", "replace");
+     bus.call_noreply(method);
+ 
+-    std::string roServiceFile =
+-        "obmc-flash-bmc-ubiro@" + versionId + ".service";
++    auto roServiceFile = "obmc-flash-bmc-ubiro@" + versionId + ".service";
+     method = bus.new_method_call(SYSTEMD_BUSNAME, SYSTEMD_PATH,
+                                  SYSTEMD_INTERFACE, "StartUnit");
+     method.append(roServiceFile, "replace");
+@@ -40,7 +37,7 @@ void Activation::onStateChanges(sdbusplus::message::message& msg)
+     // Read the msg and populate each variable
+     msg.read(newStateID, newStateObjPath, newStateUnit, newStateResult);
+ 
+-    auto rwServiceFile = "obmc-flash-bmc-ubirw@" + versionId + ".service";
++    auto rwServiceFile = "obmc-flash-bmc-ubirw.service";
+     auto roServiceFile = "obmc-flash-bmc-ubiro@" + versionId + ".service";
+     auto ubootVarsServiceFile =
+         "obmc-flash-bmc-updateubootvars@" + versionId + ".service";
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0006-Modify-the-ID-of-software-image-updater-object-on-DB.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0006-Modify-the-ID-of-software-image-updater-object-on-DB.patch
new file mode 100644
index 000000000..2d2ac2673
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0006-Modify-the-ID-of-software-image-updater-object-on-DB.patch
@@ -0,0 +1,44 @@
+From 9b3c44e9fb3d907c0152f14b967e23ab964c0e0b Mon Sep 17 00:00:00 2001
+From: Jennifer Lee <jennifer1.lee@intel.com>
+Date: Thu, 14 Feb 2019 14:54:45 -0800
+Subject: [PATCH 6/6] Modify the ID of software image updater object on DBus to
+ allow force update onto same version image
+
+In the original design of image update, it does not allow the same version of image to be flashed onto itself.
+But this blocks validation tests and in most of the cases we don't prevent user from doing such update.
+
+This patch appends a random number after the version ID hash string to unblock such limitation.
+
+Signed-off-by: Jennifer Lee <jennifer1.lee@intel.com>
+Change-Id: I16aba4804ae1bc2e8784320f91c0419fb8b23c35
+---
+ image_manager.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/image_manager.cpp b/image_manager.cpp
+index 5b2ff49..e3d26e3 100644
+--- a/image_manager.cpp
++++ b/image_manager.cpp
+@@ -9,6 +9,7 @@
+ #include <stdlib.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ #include <algorithm>
+@@ -129,6 +130,11 @@ int Manager::processImage(const std::string& tarFilePath)
+     // Compute id
+     auto id = Version::getId(version);
+ 
++    // Append a random number after the original version hash
++    // This will allow forcing image update onto the same version
++    srand(time(NULL));
++    id = id + "_" + std::to_string(rand());
++
+     fs::path imageDirPath = std::string{IMG_UPLOAD_DIR};
+     imageDirPath /= id;
+ 
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
index 80c5ea9d3..719c2562a 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
@@ -3,9 +3,11 @@ EXTRA_OECONF += "--enable-fwupd_script"
 
 SYSTEMD_SERVICE_${PN}-updater += "fwupd@.service"
 
-SRC_URI_remove = "git://github.com/openbmc/phosphor-bmc-code-mgmt"
-SRC_URI += "git://git@github.com/Intel-BMC/phosphor-bmc-code-mgmt;protocol=ssh"
-SRCREV = "f8f76c29dbe2806a6eacd15847563cdf7f7567f4"
-
 #Currently enforcing image signature validation only for PFR images
 PACKAGECONFIG_append = "${@bb.utils.contains('IMAGE_TYPE', 'pfr', ' verify_signature', '', d)}"
+
+SRC_URI += "file://0002-Redfish-firmware-activation.patch \
+            file://0004-Changed-the-condition-of-software-version-service-wa.patch \
+            file://0005-Modified-firmware-activation-to-launch-fwupd.sh-thro.patch \
+            file://0006-Modify-the-ID-of-software-image-updater-object-on-DB.patch \
+           "