| commit | 7216f421cf5f5541169427446cf8ae0d2b17b9c8 | [log] [tgz] |
|---|---|---|
| author | Patrick Williams <patrick@stwcx.xyz> | Thu Oct 06 22:00:02 2016 -0500 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Mon Oct 10 21:41:18 2016 -0500 |
| tree | 0909ebb1f1446f4b8c28b1b1fa4fd37aedce4205 | |
| parent | 49956fea3251ac155efa9861548d6884ba682975 [diff] |
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>
diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass index f8b99f4..a829751 100644 --- a/meta-phosphor/classes/skeleton-rev.bbclass +++ b/meta-phosphor/classes/skeleton-rev.bbclass
@@ -1,2 +1,2 @@ -SRCREV ?= "3205742d8f5371c12e376ec2b387dda81663213e" +SRCREV ?= "2f3213f9e0ede2f9a58bf2e912d5205300ce4bb2" SKELETON_URI ?= "git://github.com/openbmc/skeleton"
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 256f9fc..501f54a 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 @@ 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 9fead8f..0c10b09 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 @@ [Service] Restart=always -ExecStart={sbindir}/fan_control.py +ExecStart={sbindir}/fan_control.exe -f 6 Type=dbus BusName={BUSNAME} Environment="PYTHONUNBUFFERED=1"