From eb7b06498588e31d9f53283e9519769d17a981e7 Mon Sep 17 00:00:00 2001 From: James Feist Date: Wed, 19 Dec 2018 14:45:30 -0800 Subject: meta-intel: Use phosphor-pid-control Add bbappend to use dbus configuration and add custom service file that restarts always incase of a configuration change. (From meta-intel rev: 5e6de9b6c80e0d0d749952da09ed782b78af5247) Change-Id: I893ee92276458da0ace24ddc84d22e92d11a3ea1 Signed-off-by: James Feist Signed-off-by: Brad Bishop --- .../recipes-intel/packagegroups/packagegroup-intel-apps.bb | 2 +- .../fans/phosphor-pid-control/phosphor-pid-control.service | 12 ++++++++++++ .../recipes-phosphor/fans/phosphor-pid-control_%.bbappend | 5 +++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service create mode 100644 meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend diff --git a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb index 9eb5ffa64..8c0076e8f 100644 --- a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb +++ b/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb @@ -32,7 +32,7 @@ RDEPENDS_${PN}-chassis = " \ SUMMARY_${PN}-fans = "Intel Fans" RDEPENDS_${PN}-fans = " \ - obmc-control-fan \ + phosphor-pid-control \ " SUMMARY_${PN}-flash = "Intel Flash" diff --git a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service b/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service new file mode 100644 index 000000000..f4ffa17a0 --- /dev/null +++ b/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service @@ -0,0 +1,12 @@ +[Unit] +Description=Phosphor-Pid-Control Margin-based Fan Control Daemon + +[Service] +Restart=always +ExecStart={sbindir}/swampd +RestartSec=5 +StartLimitInterval=0 +Type=simple + +[Install] +WantedBy=basic.target diff --git a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend new file mode 100644 index 000000000..3e89746bf --- /dev/null +++ b/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +inherit obmc-phosphor-systemd +SYSTEMD_SERVICE_${PN} = "phosphor-pid-control.service" +EXTRA_OECONF = "--enable-configure-dbus=yes" -- cgit v1.2.1