summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Alekseev (IBS Group) <ealekseev@ibs.sila.ru>2022-09-07 15:40:44 +0300
committerEvgeny Alekseev (IBS Group) <ealekseev@ibs.sila.ru>2022-09-07 15:40:44 +0300
commit0712f552072c089e71e912bf76912cd3d4810046 (patch)
tree8c275b9847e08280dc1e1ce57708b1c11d1408f5
parentd94c2ffb033490ebf16bc555520898c9cbea6c93 (diff)
downloadopenbmc-0712f552072c089e71e912bf76912cd3d4810046.tar.xz
IBS: Fix bmcweb patch for sensor thresholds edit
-rw-r--r--meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-Add-Sensor-Warning-Threshold-Edit.patch6
-rw-r--r--meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend8
2 files changed, 7 insertions, 7 deletions
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-Add-Sensor-Warning-Threshold-Edit.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-Add-Sensor-Warning-Threshold-Edit.patch
index f1651c2909..3ebae7817d 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-Add-Sensor-Warning-Threshold-Edit.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0005-Add-Sensor-Warning-Threshold-Edit.patch
@@ -44,7 +44,7 @@ index cf63bd70..1c636f20 100644
#include <set>
#include <utility>
#include <variant>
-@@ -2855,6 +2857,149 @@ inline void setSensorsOverride(
+@@ -2857,6 +2860,151 @@ inline void setSensorsOverride(
std::move(getChassisSensorListCb));
}
@@ -188,7 +188,9 @@ index cf63bd70..1c636f20 100644
+ std::move(getObjectsWithConnectionCb));
+ };
+ // get full sensor list for the given chassisId and cross verify the sensor.
-+ getChassis(sensorAsyncResp, std::move(getChassisSensorListCb));
++ getChassis(sensorAsyncResp->asyncResp, sensorAsyncResp->chassisId,
++ sensorAsyncResp->chassisSubNode, sensorAsyncResp->types,
++ std::move(getChassisSensorListCb));
+}
+
/**
diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
index cb5ddee99e..a17c3a6729 100644
--- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -11,11 +11,9 @@ SRC_URI += "\
file://0008-Add-additional-logs-about-time-sync.patch \
file://0009-Added-additional-log-about-NTP-sync-status.patch \
file://0010-Added-check-user-priv-before-creating-KVM-and-SOL.patch \
- "
-#SRC_URI += "\
-# file://0005-Add-Sensor-Warning-Threshold-Edit.patch \
-# file://0007-Add-critical-thresholds-to-redfish.patch \
-# "
+ file://0005-Add-Sensor-Warning-Threshold-Edit.patch \
+ file://0007-Add-critical-thresholds-to-redfish.patch \
+ "
EXTRA_OEMESON += "\
-Dredfish-cpu-log=enabled \