diff options
author | Lei YU <mine260309@gmail.com> | 2017-04-25 14:19:53 +0800 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-04-25 16:50:07 +0000 |
commit | e075d754a2f3b14eb9f26bf0613f6361572f688c (patch) | |
tree | 920c6ee9ea931518f2d80292aee6be0f88320bac | |
parent | 288bf1194d8773a5a744c4eaf752147cf7b2dd21 (diff) | |
download | talos-openbmc-e075d754a2f3b14eb9f26bf0613f6361572f688c.tar.gz talos-openbmc-e075d754a2f3b14eb9f26bf0613f6361572f688c.zip |
meta-romulus: Remove P9 host watchdog workaround
Remove the watchdog workaround patch from meta-romulus;
And remove the patch itself since no machine is using it anymore.
Change-Id: I2a1d8cbce3637562a35f738fce8c6bea2738528c
Signed-off-by: Lei YU <mine260309@gmail.com>
2 files changed, 1 insertions, 34 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/obmc-control-chassis.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/obmc-control-chassis.bbappend index b60282f48..5e8ab25fa 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/obmc-control-chassis.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/obmc-control-chassis.bbappend @@ -1,3 +1 @@ -SRC_URI += "file://skeleton-0001-Temporarily-disable-watchdog-support.patch \ - file://skeleton-0001-Quick-fix-to-ensure-we-run-mbx-workaround-on-reboots.patch" - +SRC_URI += "file://skeleton-0001-Quick-fix-to-ensure-we-run-mbx-workaround-on-reboots.patch" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/files/skeleton-0001-Temporarily-disable-watchdog-support.patch b/meta-phosphor/common/recipes-phosphor/chassis/files/skeleton-0001-Temporarily-disable-watchdog-support.patch deleted file mode 100644 index d13348ef9..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/files/skeleton-0001-Temporarily-disable-watchdog-support.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a850cab934be49a08d467403a03ed1d6d76794f2 Mon Sep 17 00:00:00 2001 -From: Michael Tritz <mtritz@us.ibm.com> -Date: Tue, 21 Feb 2017 10:22:59 -0600 -Subject: [PATCH] Disable watchdog - communication issues with host - -This patch will temporarily disable watchdog -errors from doing anything meaningful until -Hostboot supports IPMI. - -Change-Id: I6afdc3b4c7bb2733f1e4469f5e45b2ea956d42c6 -Signed-off-by: Michael Tritz <mtritz@us.ibm.com> ---- - chassis_control.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/chassis_control.py b/chassis_control.py -index faf7d1d..2ec9bd2 100644 ---- a/chassis_control.py -+++ b/chassis_control.py -@@ -207,8 +207,7 @@ class ChassisControlObject(DbusProperties, DbusObjectManager): - self.softReboot() - - def host_watchdog_signal_handler(self): -- print "Watchdog Error, Going to quiesce" -- self.quiesce() -+ print "Watchdog Error, ignoring due to Hostboot not supporting IPMI" - - def emergency_shutdown_signal_handler(self, message): - print "Emergency Shutdown!" --- -2.10.1 (Apple Git-78) |