1 files changed, 36 insertions, 0 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0010-fix-get-system-GUID-ipmi-command.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0010-fix-get-system-GUID-ipmi-command.patch
new file mode 100644
index 000000000..efee7cc26
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0010-fix-get-system-GUID-ipmi-command.patch
@@ -0,0 +1,36 @@
+commit 72e6573f36fd3b9ce018e71b07bc1be63275d1f8
+Author: Vernon Mauery <vernon.mauery@linux.intel.com>
+Date:   Fri Jun 21 12:27:20 2019 -0700
+
+    Fix 'Get System GUID' to use settings UUID
+    
+    The upstream Get System GUID command looks first for a BMC interface
+    and then assumes that the UUID interface is next to that. But that is
+    not the case on Intel systems where the system GUID is found in the
+    settings daemon.
+    
+    Change-Id: I924bd05e0a546f2b30288c1faf72157296ab6579
+    Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
+
+diff --git a/apphandler.cpp b/apphandler.cpp
+index 280d0db..25af6bb 100644
+--- a/apphandler.cpp
++++ b/apphandler.cpp
+@@ -799,8 +799,6 @@ auto ipmiAppGetBtCapabilities()
+ 
+ auto ipmiAppGetSystemGuid() -> ipmi::RspType<std::array<uint8_t, 16>>
+ {
+-    static constexpr auto bmcInterface =
+-        "xyz.openbmc_project.Inventory.Item.Bmc";
+     static constexpr auto uuidInterface = "xyz.openbmc_project.Common.UUID";
+     static constexpr auto uuidProperty = "UUID";
+ 
+@@ -809,7 +807,7 @@ auto ipmiAppGetSystemGuid() -> ipmi::RspType<std::array<uint8_t, 16>>
+     {
+         // Get the Inventory object implementing BMC interface
+         auto busPtr = getSdBus();
+-        auto objectInfo = ipmi::getDbusObject(*busPtr, bmcInterface);
++        auto objectInfo = ipmi::getDbusObject(*busPtr, uuidInterface);
+ 
+         // Read UUID property value from bmcObject
+         // UUID is in RFC4122 format Ex: 61a39523-78f2-11e5-9862-e6402cfc3223