diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0010-fix-get-system-GUID-ipmi-command.patch')
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0010-fix-get-system-GUID-ipmi-command.patch | 35 |
1 files changed, 20 insertions, 15 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 index efee7cc26..ccf326a91 100644 --- 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 @@ -1,22 +1,24 @@ -commit 72e6573f36fd3b9ce018e71b07bc1be63275d1f8 -Author: Vernon Mauery <vernon.mauery@linux.intel.com> -Date: Fri Jun 21 12:27:20 2019 -0700 +From c1925ab965271875d4e9333be85cdfe8e1516948 Mon Sep 17 00:00:00 2001 +From: Vernon Mauery <vernon.mauery@linux.intel.com> +Date: Fri, 14 Feb 2020 13:13:06 -0800 +Subject: [PATCH] Fix 'Get System GUID' to use settings UUID - 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> +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> +--- + apphandler.cpp | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apphandler.cpp b/apphandler.cpp -index 280d0db..25af6bb 100644 +index dcfda11..780afbc 100644 --- a/apphandler.cpp +++ b/apphandler.cpp -@@ -799,8 +799,6 @@ auto ipmiAppGetBtCapabilities() +@@ -784,8 +784,6 @@ auto ipmiAppGetBtCapabilities() auto ipmiAppGetSystemGuid() -> ipmi::RspType<std::array<uint8_t, 16>> { @@ -25,7 +27,7 @@ index 280d0db..25af6bb 100644 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>> +@@ -794,7 +792,7 @@ auto ipmiAppGetSystemGuid() -> ipmi::RspType<std::array<uint8_t, 16>> { // Get the Inventory object implementing BMC interface auto busPtr = getSdBus(); @@ -34,3 +36,6 @@ index 280d0db..25af6bb 100644 // Read UUID property value from bmcObject // UUID is in RFC4122 format Ex: 61a39523-78f2-11e5-9862-e6402cfc3223 +-- +2.17.1 + |