summaryrefslogtreecommitdiff
path: root/meta-ibm/recipes-phosphor/dbus
diff options
context:
space:
mode:
authorMatt Spinler <spinler@us.ibm.com>2021-01-19 23:09:34 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2021-01-28 01:09:42 +0300
commitf3e7ceeb25c4e1809fd54eb7b6ef97ce4ceba3c6 (patch)
tree12149d4789b489ec8ac9fb2427672aff3930893f /meta-ibm/recipes-phosphor/dbus
parentf197793a823fd9ddbb31a21a465933734e626e24 (diff)
downloadopenbmc-f3e7ceeb25c4e1809fd54eb7b6ef97ce4ceba3c6.tar.xz
meta-ibm: Use fan-monitor for fan errors
Instead of using phosphor-dbus-monitor to create errors and handle power offs for fan errors, use phosphor-fan-monitor instead, now that it has the functionality. To do this, add the new rules to the fan monitor config files, and remove the phosphor-dbus-monitor fan rules files. Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: Ia03186132f04087be76d2fd43412c37698407f60
Diffstat (limited to 'meta-ibm/recipes-phosphor/dbus')
-rw-r--r--meta-ibm/recipes-phosphor/dbus/fan-policy.bb6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
index f8355053d..59e6347cc 100644
--- a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
@@ -12,6 +12,9 @@ SRC_URI += "file://air-cooled.yaml"
SRC_URI_append_ibm-ac-server = " file://water-cooled.yaml"
SRC_URI += "file://fan-errors.yaml"
+SRC_URI_remove_rainier = "file://air-cooled.yaml"
+SRC_URI_remove_rainier = "file://fan-errors.yaml"
+
do_install_append_ibm-ac-server() {
install -D ${WORKDIR}/air-cooled.yaml ${D}${config_dir}/air-cooled.yaml
install -D ${WORKDIR}/water-cooled.yaml ${D}${config_dir}/water-cooled.yaml
@@ -26,3 +29,6 @@ do_install_append_mihawk() {
FILES_${PN} += "${config_dir}/air-cooled.yaml"
FILES_${PN}_append_ibm-ac-server = " ${config_dir}/water-cooled.yaml"
FILES_${PN} += "${config_dir}/fan-errors.yaml"
+
+FILES_${PN}_remove_rainier = "${config_dir}/air-cooled.yaml"
+FILES_${PN}_remove_rainier = "${config_dir}/fan-errors.yaml"