diff options
3 files changed, 6 insertions, 9 deletions
diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass index f8b99f4ec..a829751ce 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 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" |