diff options
| author | Nikita Kosenkov <NKosenkov@IBS.RU> | 2022-09-14 12:55:41 +0300 |
|---|---|---|
| committer | Nikita Kosenkov <NKosenkov@IBS.RU> | 2022-09-14 12:55:41 +0300 |
| commit | 3a8e00494070c697f877ea7d920496feea047ccb (patch) | |
| tree | 39f7e8a28cea9dbd4b408115fd00dfdfc99e5b5c | |
| parent | 8670119f3af54477dfb758ccefe15fe45c3932a7 (diff) | |
| download | openbmc-3a8e00494070c697f877ea7d920496feea047ccb.tar.xz | |
IBS: Fix patches from 'sila' branch
3 files changed, 4 insertions, 27 deletions
diff --git a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0004-AS1200-JSON-Add-Thresholds-and-IPMI.patch b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0004-AS1200-JSON-Add-Thresholds-and-IPMI.patch index 4ff26e146c..ad0ddb3ccb 100644 --- a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0004-AS1200-JSON-Add-Thresholds-and-IPMI.patch +++ b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0004-AS1200-JSON-Add-Thresholds-and-IPMI.patch @@ -4,13 +4,13 @@ Date: Tue, 6 Sep 2022 09:17:51 +0300 Subject: [PATCH] AS1200 JSON Add Thresholds and IPMI --- - configurations/ASPOWER_U1A-D11200_PSU.json | 102 ++++++++++++++++++++- + configurations/aspower_u1a-d11200_psu.json | 102 ++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) -diff --git a/configurations/ASPOWER_U1A-D11200_PSU.json b/configurations/ASPOWER_U1A-D11200_PSU.json +diff --git a/configurations/aspower_u1a-d11200_psu.json b/configurations/aspower_u1a-d11200_psu.json index 02dc389..3651983 100644 ---- a/configurations/ASPOWER_U1A-D11200_PSU.json -+++ b/configurations/ASPOWER_U1A-D11200_PSU.json +--- a/configurations/aspower_u1a-d11200_psu.json ++++ b/configurations/aspower_u1a-d11200_psu.json @@ -100,6 +100,20 @@ ], "Name": "PSU$ADDRESS % 4 + 1", diff --git a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Fix-Threshold-WarningAlarmLow.patch b/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Fix-Threshold-WarningAlarmLow.patch deleted file mode 100644 index a73305f507..0000000000 --- a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Fix-Threshold-WarningAlarmLow.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7b38750f99991fd45ba2d1de36251117b73d3294 Mon Sep 17 00:00:00 2001 -From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru> -Date: Mon, 5 Sep 2022 16:35:13 +0300 -Subject: [PATCH] Fix Threshold WarningAlarmLow - ---- - sensordatahandler.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sensordatahandler.hpp b/sensordatahandler.hpp -index 1cb2b40..ab837bb 100644 ---- a/sensordatahandler.hpp -+++ b/sensordatahandler.hpp -@@ -325,7 +325,7 @@ GetSensorResponse readingData(const Info& sensorInfo) - { - warningAlarmLow = std::get<bool>(ipmi::getDbusProperty( - bus, service, sensorInfo.sensorPath, -- "xyz.openbmc_project.Sensor.Threshold.Warning", "WarningAlarmlow")); -+ "xyz.openbmc_project.Sensor.Threshold.Warning", "WarningAlarmLow")); - } - catch (const std::exception& e) - { diff --git a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index ddf101ea0f..09a85c8575 100644 --- a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -2,7 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI:append = " \ file://0001-Added-reset-OneTime-override-properties.patch \ - file://0002-Fix-Threshold-WarningAlarmLow.patch \ " do_install:append:ibs(){ |