From 2169159e01901ac82f44641d764e72a264ffde46 Mon Sep 17 00:00:00 2001 From: "Andrey V.Kosteltsev" Date: Thu, 2 Jun 2022 10:04:53 +0300 Subject: reverted: x86-power-control: changed starting condition for power policy controller --- ...ontrol-removed-the-conditions-for-startin.patch | 41 ---------------------- .../chassis/x86-power-control_%.bbappend | 3 +- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0001-x86-power-control-removed-the-conditions-for-startin.patch diff --git a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0001-x86-power-control-removed-the-conditions-for-startin.patch b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0001-x86-power-control-removed-the-conditions-for-startin.patch deleted file mode 100644 index 636f922227..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0001-x86-power-control-removed-the-conditions-for-startin.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cf1bd45c8f33c0fb22113708e076f34784552d1f Mon Sep 17 00:00:00 2001 -From: "Nikita Kosenkov (IBS Group)" -Date: Tue, 31 May 2022 06:51:46 +0300 -Subject: [PATCH] x86-power-control: removed the conditions for starting the - power restore policy - ---- - src/power_control.cpp | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/src/power_control.cpp b/src/power_control.cpp -index 05aa45c..56346ed 100644 ---- a/src/power_control.cpp -+++ b/src/power_control.cpp -@@ -2754,8 +2754,8 @@ int main(int argc, char* argv[]) - - // Initialize the power state - powerState = PowerState::off; -+ - // Check power good -- - if (powerOkConfig.type == ConfigType::GPIO) - { - if (psPowerOKLine.get_value() > 0 || -@@ -2772,11 +2772,9 @@ int main(int argc, char* argv[]) - powerState = PowerState::on; - } - } -+ - // Check if we need to start the Power Restore policy -- if (powerState != PowerState::on) -- { -- powerRestore.run(); -- } -+ powerRestore.run(); - - if (nmiOutLine) - nmiSourcePropertyMonitor(); --- -2.35.1 - diff --git a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend index cc6668c0d7..d8a4104b65 100644 --- a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,8 +1,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI:append = " \ file://power-config-host0.json \ - file://0001-x86-power-control-removed-the-conditions-for-startin.patch \ -" + " RDEPENDS:${PN}:append = " bash" -- cgit v1.2.3