Remove hack from skeleton for mboxd workaround
mboxd has been fixed so this workaround is no longer needed
Change-Id: I1eca65558c446e982174f1c4af2f484b8fe5c3b8
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
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
deleted file mode 100644
index 5e8ab25..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/chassis/obmc-control-chassis.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-SRC_URI += "file://skeleton-0001-Quick-fix-to-ensure-we-run-mbx-workaround-on-reboots.patch"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-control-chassis.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-control-chassis.bbappend
deleted file mode 100644
index 5e8ab25..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-control-chassis.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-SRC_URI += "file://skeleton-0001-Quick-fix-to-ensure-we-run-mbx-workaround-on-reboots.patch"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/obmc-control-chassis.bbappend b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/obmc-control-chassis.bbappend
deleted file mode 100644
index 5e8ab25..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/obmc-control-chassis.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-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-Quick-fix-to-ensure-we-run-mbx-workaround-on-reboots.patch b/meta-phosphor/common/recipes-phosphor/chassis/files/skeleton-0001-Quick-fix-to-ensure-we-run-mbx-workaround-on-reboots.patch
deleted file mode 100644
index b300234..0000000
--- a/meta-phosphor/common/recipes-phosphor/chassis/files/skeleton-0001-Quick-fix-to-ensure-we-run-mbx-workaround-on-reboots.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 15d14532aa66108716d5ffb6bd8222277f9451ab Mon Sep 17 00:00:00 2001
-From: Andrew Geissler <andrewg@us.ibm.com>
-Date: Fri, 27 Jan 2017 16:29:28 -0600
-Subject: [PATCH] Quick fix to ensure we run mbx workaround on reboots
-
-See openbmc/openbmc#1045 for more details
-
-Change-Id: I55ce69a7cb05bc4274bc4af70cee5d387492f76e
-Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
----
- chassis_control.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/chassis_control.py b/chassis_control.py
-index 3637d82..eae7875 100644
---- a/chassis_control.py
-+++ b/chassis_control.py
-@@ -4,6 +4,7 @@ import gobject
- import dbus
- import dbus.service
- import dbus.mainloop.glib
-+import time
- from obmc.dbuslib.bindings import get_dbus, DbusProperties, DbusObjectManager
-
- DBUS_NAME = 'org.openbmc.control.Chassis'
-@@ -181,6 +182,10 @@ class ChassisControlObject(DbusProperties, DbusObjectManager):
-
- if (state_name == "HOST_POWERED_OFF" and self.Get(DBUS_NAME,
- "reboot") == 1):
-+ # TODO - Hack to give time for mbx to reload during
-+ # power off phase of a reboot
-+ print "Sleeping to give mbx time to reload"
-+ time.sleep(10)
- self.powerOn()
-
- def power_button_signal_handler(self):
---
-2.11.0
-