Update to internal 0.26

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

1 files changed, 32 insertions, 12 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0008-item_updater-update-the-bmc_active-objectPath.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0008-item_updater-update-the-bmc_active-objectPath.patch
index bac756a18..e0ff79795 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0008-item_updater-update-the-bmc_active-objectPath.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0008-item_updater-update-the-bmc_active-objectPath.patch
@@ -6,25 +6,45 @@ Subject: [PATCH] item_updater: update the bmc_active objectPath
 Update the Software object path to bmc_active instead of random Id.
 
 Signed-off-by: Chalapathi <chalapathix.venkataramashetty@intel.com>
+
 ---
- item_updater.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
+ item_updater.cpp | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/item_updater.cpp b/item_updater.cpp
-index 7fe69e4..3ce1dbf 100644
+index e6dd298..c3a846d 100644
 --- a/item_updater.cpp
 +++ b/item_updater.cpp
-@@ -175,9 +175,7 @@ void ItemUpdater::processBMCImage()
+@@ -175,7 +175,8 @@ void ItemUpdater::processBMCImage()
          if (0 ==
              iter.path().native().compare(0, BMC_RO_PREFIX_LEN, BMC_ROFS_PREFIX))
          {
--            // The versionId is extracted from the path
--            // for example /media/ro-2a1022fe.
--            auto id = iter.path().native().substr(BMC_RO_PREFIX_LEN);
+-            // Get the version to calculate the id
 +            std::string id = "bmc_active";
-             auto osRelease = iter.path() / OS_RELEASE_FILE;
++            // upstream changed this to relative_path ... is that right?
+             fs::path releaseFile(OS_RELEASE_FILE);
+             auto osRelease = iter.path() / releaseFile.relative_path();
              if (!fs::is_regular_file(osRelease))
-             {
--- 
-2.17.1
-
+@@ -189,7 +190,6 @@ void ItemUpdater::processBMCImage()
+                 // volumes created by the UBI layout for example have the id in
+                 // the mount directory name. The worst that can happen is that
+                 // erase() is called with an non-existent id and returns.
+-                auto id = iter.path().native().substr(BMC_RO_PREFIX_LEN);
+                 ItemUpdater::erase(id);
+ 
+                 continue;
+@@ -203,14 +203,11 @@ void ItemUpdater::processBMCImage()
+ 
+                 // Try to delete the version, same as above if the
+                 // OS_RELEASE_FILE does not exist.
+-                auto id = iter.path().native().substr(BMC_RO_PREFIX_LEN);
+                 ItemUpdater::erase(id);
+ 
+                 continue;
+             }
+ 
+-            auto id = VersionClass::getId(version);
+-
+             // Check if the id has already been added. This can happen if the
+             // BMC partitions / devices were manually flashed with the same
+             // image.