diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-02-28 02:57:13 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-02 22:06:57 +0300 |
| commit | 6c1caca70063aa707ba809a6b4695d0f0c5646f1 (patch) | |
| tree | 84da2f29a60cb571686d3a4fb93f9d1f1189d989 /meta-openbmc-mods/meta-common/recipes-phosphor/interfaces | |
| parent | 9600a7403ba2848c8751280077503a3e0f2f3481 (diff) | |
| download | openbmc-6c1caca70063aa707ba809a6b4695d0f0c5646f1.tar.xz | |
Update to internal 2020-02-27
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/interfaces')
2 files changed, 15 insertions, 25 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-support-for-StandBySpare.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-support-for-StandBySpare.patch index 9e7cdf768..dc3ec060e 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-support-for-StandBySpare.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-support-for-StandBySpare.patch @@ -1,6 +1,6 @@ -From ba9d7f8443716887bc101e300b06c570f7da8159 Mon Sep 17 00:00:00 2001 -From: Vikram Bodireddy <vikram.bodireddy@linux.intel.com> -Date: Thu, 5 Dec 2019 15:13:52 +0530 +From 17caf10b048450979dcd95a9f9333bbaa8c307ec Mon Sep 17 00:00:00 2001 +From: AppaRao Puli <apparao.puli@linux.intel.com> +Date: Fri, 10 Jan 2020 08:16:10 +0530 Subject: [PATCH] Firmware update support for StandBySpare Firmware update support for StandBySpare. This will @@ -28,12 +28,13 @@ Tested: Change-Id: I59f317ac001ebf56bbf30e7f43dbec5d69fa249a Signed-off-by: Vikram Bodireddy <vikram.bodireddy@linux.intel.com> +Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> --- - redfish-core/lib/update_service.hpp | 285 ++++++++++++++++++++++++++++++------ - 1 file changed, 241 insertions(+), 44 deletions(-) + redfish-core/lib/update_service.hpp | 284 ++++++++++++++++++++++++++++++------ + 1 file changed, 241 insertions(+), 43 deletions(-) diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp -index 57dcc07..c189d5a 100644 +index ec9600e..9daf6ce 100644 --- a/redfish-core/lib/update_service.hpp +++ b/redfish-core/lib/update_service.hpp @@ -30,6 +30,17 @@ static std::unique_ptr<sdbusplus::bus::match::match> fwUpdateMatcher; @@ -448,18 +449,17 @@ index 57dcc07..c189d5a 100644 std::string filepath( "/tmp/images/" + -@@ -569,9 +770,7 @@ class SoftwareInventoryCollection : public Node - "xyz.openbmc_project.ObjectMapper", +@@ -574,8 +775,7 @@ class SoftwareInventoryCollection : public Node "/xyz/openbmc_project/object_mapper", - "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/", -- static_cast<int32_t>(0), + "xyz.openbmc_project.ObjectMapper", "GetSubTree", + "/xyz/openbmc_project/software", static_cast<int32_t>(0), - std::array<const char *, 1>{ - "xyz.openbmc_project.Software.Version"}); -+ static_cast<int32_t>(0), std::array<const char *, 1>{versionIntf}); ++ std::array<const char *, 1>{versionIntf}); } }; -@@ -756,7 +955,7 @@ class SoftwareInventory : public Node +@@ -760,7 +960,7 @@ class SoftwareInventory : public Node }, obj.second[0].first, obj.first, "org.freedesktop.DBus.Properties", "GetAll", @@ -468,7 +468,7 @@ index 57dcc07..c189d5a 100644 } if (!found) { -@@ -778,9 +977,7 @@ class SoftwareInventory : public Node +@@ -781,9 +981,7 @@ class SoftwareInventory : public Node "xyz.openbmc_project.ObjectMapper", "/xyz/openbmc_project/object_mapper", "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/", diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend index 3c679fc51..795d34daf 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/openbmc/bmcweb.git" -SRCREV = "123e823757a6efc08b215766124ba7321e3cca55" +SRCREV = "f723d7332bbdd7b0d4fbe4aa730b63dfd8db7eff" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" @@ -9,18 +9,8 @@ USERADD_PARAM_${PN} = "-r -s /usr/sbin/nologin -d /home/bmcweb -m -G shadow bmcw GROUPADD_PARAM_${PN} = "web; redfish " -SRC_URI += "file://0001-Firmware-update-support-for-StandBySpare.patch \ - " - -# Enable CPU Log and Raw PECI support -EXTRA_OECMAKE += "-DBMCWEB_ENABLE_REDFISH_CPU_LOG=ON" -EXTRA_OECMAKE += "-DBMCWEB_ENABLE_REDFISH_RAW_PECI=ON" - -# Enable Redfish BMC Journal support -EXTRA_OECMAKE += "-DBMCWEB_ENABLE_REDFISH_BMC_JOURNAL=ON" +SRC_URI += "file://0001-Firmware-update-support-for-StandBySpare.patch" # Enable PFR support EXTRA_OECMAKE += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', '-DBMCWEB_ENABLE_REDFISH_PROVISIONING_FEATURE=ON', '', d)}" -#Disable the Dbus interface -EXTRA_OECMAKE += "-DBMCWEB_ENABLE_DBUS_REST=OFF" |