From c6b9739f3fb6b5e9c90b88dea132d90175dbb743 Mon Sep 17 00:00:00 2001 From: "Andrey V.Kosteltsev" Date: Tue, 6 Sep 2022 16:21:42 +0300 Subject: Bump bmcweb version to 3e7ab70817a6e49684c7c01ec0f2d67630f36559 --- .../0001-IBS-Default-BMC-Name-and-Model.patch | 10 +++++----- .../recipes-phosphor/interfaces/bmcweb_%.bbappend | 22 +++++++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) (limited to 'meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces') diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0001-IBS-Default-BMC-Name-and-Model.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0001-IBS-Default-BMC-Name-and-Model.patch index cf74d8c28c..ae82fb562e 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0001-IBS-Default-BMC-Name-and-Model.patch +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0001-IBS-Default-BMC-Name-and-Model.patch @@ -1,6 +1,6 @@ -From cfef198e816222d960cc003e3717bb9d79a89d60 Mon Sep 17 00:00:00 2001 +From c80dd7a21e9398f5672ff161bf473b2c5ddcf0c1 Mon Sep 17 00:00:00 2001 From: "Andrey V.Kosteltsev" -Date: Tue, 12 Jul 2022 12:09:23 +0300 +Date: Tue, 6 Sep 2022 16:15:10 +0300 Subject: [PATCH] IBS: Default BMC Name and Model --- @@ -8,10 +8,10 @@ Subject: [PATCH] IBS: Default BMC Name and Model 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp -index d1e43fb44..446a53dfc 100644 +index f934fd6f..d69bab27 100644 --- a/redfish-core/lib/managers.hpp +++ b/redfish-core/lib/managers.hpp -@@ -1959,7 +1959,7 @@ inline void requestRoutesManager(App& app) +@@ -1928,7 +1928,7 @@ inline void requestRoutesManager(App& app) asyncResp->res.jsonValue["@odata.id"] = "/redfish/v1/Managers/bmc"; asyncResp->res.jsonValue["@odata.type"] = "#Manager.v1_14_0.Manager"; asyncResp->res.jsonValue["Id"] = "bmc"; @@ -20,7 +20,7 @@ index d1e43fb44..446a53dfc 100644 asyncResp->res.jsonValue["Description"] = "Baseboard Management Controller"; asyncResp->res.jsonValue["PowerState"] = "On"; -@@ -1969,7 +1969,7 @@ inline void requestRoutesManager(App& app) +@@ -1938,7 +1938,7 @@ inline void requestRoutesManager(App& app) asyncResp->res.jsonValue["ManagerType"] = "BMC"; asyncResp->res.jsonValue["UUID"] = systemd_utils::getUuid(); asyncResp->res.jsonValue["ServiceEntryPointUUID"] = uuid; diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend index 29a8481044..69ce3be11a 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -2,17 +2,21 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://0001-IBS-Default-BMC-Name-and-Model.patch \ - file://0002-add-new-cpu-fields.patch \ - file://0003-add-new-dimm-fields.patch \ - file://0004-configure-telemetry.patch \ - file://0005-Fix-keep-and-re-send-initial-negotiation-data-from-W.patch \ - file://0006-fix-bug-empty-pcie-functions.patch \ - file://0007-Removed-non-working-boot-override-modes.patch \ - file://0008-Add-pcie-device-names.patch \ - file://0009-fix-circular-buffer-telemetry.patch \ - file://00010-Add-smtp-client.patch \ " +#SRC_URI += "\ +# file://0001-IBS-Default-BMC-Name-and-Model.patch \ +# file://0002-add-new-cpu-fields.patch \ +# file://0003-add-new-dimm-fields.patch \ +# file://0004-configure-telemetry.patch \ +# file://0005-Fix-keep-and-re-send-initial-negotiation-data-from-W.patch \ +# file://0006-fix-bug-empty-pcie-functions.patch \ +# file://0007-Removed-non-working-boot-override-modes.patch \ +# file://0008-Add-pcie-device-names.patch \ +# file://0009-fix-circular-buffer-telemetry.patch \ +# file://00010-Add-smtp-client.patch \ +# " + EXTRA_OEMESON += "\ -Dredfish-host-logger=enabled \ -Dredfish-dump-log=enabled \ -- cgit v1.2.3