summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common/recipes-phosphor/fans
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2016-10-06 22:00:02 -0500
committerPatrick Williams <patrick@stwcx.xyz>2016-10-10 21:41:18 -0500
commit7216f421cf5f5541169427446cf8ae0d2b17b9c8 (patch)
tree0909ebb1f1446f4b8c28b1b1fa4fd37aedce4205 /meta-phosphor/common/recipes-phosphor/fans
parent49956fea3251ac155efa9861548d6884ba682975 (diff)
downloadtalos-openbmc-7216f421cf5f5541169427446cf8ae0d2b17b9c8.tar.gz
talos-openbmc-7216f421cf5f5541169427446cf8ae0d2b17b9c8.zip
Change obmc-phosphor-fan to use fanctl
A new fanctl module is added in skeleton to replace pyfanctl. fanctl is written in C instead of python. Partially resolves openbmc/openbmc#93 Change-Id: I404176f3d526027abac089a4c168240ba6ae69b1 Signed-off-by: Yi Li <adamliyi@msn.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/fans')
-rw-r--r--meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb11
-rw-r--r--meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service2
2 files changed, 5 insertions, 8 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb
index 256f9fc20..501f54abc 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb
+++ b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb
@@ -2,14 +2,11 @@ SUMMARY = "OpenBMC fan control"
DESCRIPTION = "OpenBMC fan control."
PR = "r1"
-inherit skeleton-python
+inherit skeleton-sdbus
inherit obmc-phosphor-dbus-service
-RDEPENDS_${PN} += "\
- python-dbus \
- python-pygobject \
- pyphosphor-dbus \
- "
-SKELETON_DIR = "pyfanctl"
+RDEPENDS_${PN} += "libsystemd"
+SKELETON_DIR = "fanctl"
+
DBUS_SERVICE_${PN} += "org.openbmc.control.Fans.service"
SYSTEMD_SERVICE_${PN} += "obmc-max-fans.service"
diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
index 9fead8fbe..0c10b09d1 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
+++ b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service
@@ -7,7 +7,7 @@ Before=obmc-fan-control.target
[Service]
Restart=always
-ExecStart={sbindir}/fan_control.py
+ExecStart={sbindir}/fan_control.exe -f 6
Type=dbus
BusName={BUSNAME}
Environment="PYTHONUNBUFFERED=1"
OpenPOWER on IntegriCloud