gbmcweb: SRCREV bump cdd2d955...9a328dd1
Rahul Kapoor (4):
9a328dd1 Handle duplicate entries in managedStore PQ
1963cf6b Export priority queue entries for debug
27492ba4 bmcweb: managedStore: Fix pq requeue logic
cdd2d955 Memory: Fix property types
Google-Bug-Id: 294570729
Change-Id: I724ddd6bb98c255f29d063a00857fdef85fe97f1
Signed-off-by: Rahul Kapoor <rahulkpr@google.com>
diff --git a/recipes-phosphor/interfaces/bmcweb/0001-Change-the-byte-of-the-MemoryAttributes-attribute-to.patch b/recipes-phosphor/interfaces/bmcweb/0001-Change-the-byte-of-the-MemoryAttributes-attribute-to.patch
deleted file mode 100644
index 48932c3..0000000
--- a/recipes-phosphor/interfaces/bmcweb/0001-Change-the-byte-of-the-MemoryAttributes-attribute-to.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 68baf50acedb33ec01d2ed5c0c7a7f6f735c2222 Mon Sep 17 00:00:00 2001
-From: George Liu <liuxiwei@inspur.com>
-Date: Thu, 15 Jun 2023 08:53:11 +0800
-Subject: [PATCH] Change the byte of the MemoryAttributes attribute to the size
- type
-
-There is a patch [1] about changing the byte type of the
-MemoryAttributes attribute to size_t, so we need to update the
-relevant code in bmcweb synchronously.
-
-[1] https://gerrit.openbmc.org/c/openbmc/phosphor-dbus-interfaces/+/63799
-
-Patch Tracking Bug: b/294570729
-Upstream info / review:
- https://gerrit.openbmc.org/c/openbmc/bmcweb/+/64212
-Upstream-Status: Accepted
-Justification: gbmcweb/bmcweb not sync to upstream and need this
-
-Signed-off-by: George Liu <liuxiwei@inspur.com>
-Change-Id: I6fca731956750cdf8f749f963bbc12137fec7796
-(cherry picked from commit 6995c1ce42d5bc2d223af7d3b2f3cae613d3b231)
----
- redfish-core/lib/memory.hpp | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/redfish-core/lib/memory.hpp b/redfish-core/lib/memory.hpp
-index 141b06c8..d2d0223f 100644
---- a/redfish-core/lib/memory.hpp
-+++ b/redfish-core/lib/memory.hpp
-@@ -412,7 +412,7 @@ inline void
- const std::string* ecc = nullptr;
- const std::string* formFactor = nullptr;
- const std::vector<uint16_t>* allowedSpeedsMT = nullptr;
-- const uint8_t* memoryAttributes = nullptr;
-+ const size_t* memoryAttributes = nullptr;
- const uint16_t* memoryConfiguredSpeedInMhz = nullptr;
- const std::string* memoryType = nullptr;
- const std::string* channel = nullptr;
-@@ -528,8 +528,7 @@ inline void
-
- if (memoryAttributes != nullptr)
- {
-- aResp->res.jsonValue[jsonPtr]["RankCount"] =
-- static_cast<uint64_t>(*memoryAttributes);
-+ aResp->res.jsonValue[jsonPtr]["RankCount"] = *memoryAttributes;
- }
-
- if (memoryConfiguredSpeedInMhz != nullptr)
---
-2.41.0.585.gd2178a4bd4-goog
-
diff --git a/recipes-phosphor/interfaces/bmcweb_%.bbappend b/recipes-phosphor/interfaces/bmcweb_%.bbappend
index 73fc837..4571b18 100644
--- a/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -25,12 +25,6 @@
SRC_URI:append:gbmc:gbmcfork = " ${GBMCWEB_SRC_URI}"
SRCREV:gbmcfork = "${GBMCWEB_SRCREV}"
-# TODO(b/294557806): Remove after this change is in gbmcweb and
-# bmcweb rebase.
-SRC_URI:append:gbmc = " \
- file://0001-Change-the-byte-of-the-MemoryAttributes-attribute-to.patch \
-"
-
topology_patches = " \
file://0001-Update-DIMM-memorySizeInKB-to-be-in-size_t.patch \
file://0001-health-Add-option-to-disable-health-populate.patch \
diff --git a/recipes-phosphor/interfaces/gbmcweb.inc b/recipes-phosphor/interfaces/gbmcweb.inc
index fd2a691..7d8b1f6 100644
--- a/recipes-phosphor/interfaces/gbmcweb.inc
+++ b/recipes-phosphor/interfaces/gbmcweb.inc
@@ -1,2 +1,2 @@
GBMCWEB_SRC_URI = "git://gbmc.googlesource.com/gbmcweb;branch=master;protocol=https"
-GBMCWEB_SRCREV = "8d4d0a80d6f86017f81ab49bc57e893872f8edcb"
+GBMCWEB_SRCREV = "cdd2d955b409189051c6d6f1c2cd59ad069f7eae"
