<div dir="ltr"><div>Hi,<br></div>Please could you use ${systemd_system_unitdir} instead of ${systemd_unitdir}/system ?<br></div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature">Pau Espin Pedrol<br>mail/jabber: <a href="mailto:pespin.shar@gmail.com" target="_blank">pespin.shar@gmail.com</a><br><a href="http://blog.espeweb.net" target="_blank">http://blog.espeweb.net</a><br></div></div>
<br><div class="gmail_quote">2016-01-25 3:48 GMT+01:00  <span dir="ltr">&lt;<a href="mailto:rongqing.li@windriver.com" target="_blank">rongqing.li@windriver.com</a>&gt;</span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Roy Li &lt;<a href="mailto:rongqing.li@windriver.com">rongqing.li@windriver.com</a>&gt;<br>
<br>
1. inherit systemd, and add two unit files which are from Fedora 23<br>
2. auto load soft dog kernel module<br>
<br>
Signed-off-by: Roy Li &lt;<a href="mailto:rongqing.li@windriver.com">rongqing.li@windriver.com</a>&gt;<br>
---<br>
 .../watchdog/watchdog/watchdog-ping.service             | 12 ++++++++++++<br>
 .../recipes-extended/watchdog/watchdog/watchdog.service | 12 ++++++++++++<br>
 meta/recipes-extended/watchdog/<a href="http://watchdog_5.14.bb" rel="noreferrer" target="_blank">watchdog_5.14.bb</a>         | 17 ++++++++++++++++-<br>
 3 files changed, 40 insertions(+), 1 deletion(-)<br>
 create mode 100644 meta/recipes-extended/watchdog/watchdog/watchdog-ping.service<br>
 create mode 100644 meta/recipes-extended/watchdog/watchdog/watchdog.service<br>
<br>
diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service b/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service<br>
new file mode 100644<br>
index 0000000..fce6e12<br>
--- /dev/null<br>
+++ b/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service<br>
@@ -0,0 +1,12 @@<br>
+[Unit]<br>
+Description=watchdog daemon for use with ping test / network dependency<br>
+After=network.target<br>
+Conflicts=watchdog.service<br>
+<br>
+[Service]<br>
+Type=forking<br>
+ExecStart=@SBINDIR@/watchdog<br>
+ControlGroup=cpu:/<br>
+<br>
+[Install]<br>
+WantedBy=multi-user.target<br>
diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog.service b/meta/recipes-extended/watchdog/watchdog/watchdog.service<br>
new file mode 100644<br>
index 0000000..f945bc9<br>
--- /dev/null<br>
+++ b/meta/recipes-extended/watchdog/watchdog/watchdog.service<br>
@@ -0,0 +1,12 @@<br>
+[Unit]<br>
+Description=watchdog daemon<br>
+# man systemd.special<br>
+# auto added After=basic.target<br>
+<br>
+[Service]<br>
+Type=forking<br>
+ExecStart=@SBINDIR@/watchdog<br>
+ControlGroup=cpu:/<br>
+<br>
+[Install]<br>
+WantedBy=multi-user.target<br>
diff --git a/meta/recipes-extended/watchdog/<a href="http://watchdog_5.14.bb" rel="noreferrer" target="_blank">watchdog_5.14.bb</a> b/meta/recipes-extended/watchdog/<a href="http://watchdog_5.14.bb" rel="noreferrer" target="_blank">watchdog_5.14.bb</a><br>
index fc717bc..9e21075 100644<br>
--- a/meta/recipes-extended/watchdog/<a href="http://watchdog_5.14.bb" rel="noreferrer" target="_blank">watchdog_5.14.bb</a><br>
+++ b/meta/recipes-extended/watchdog/<a href="http://watchdog_5.14.bb" rel="noreferrer" target="_blank">watchdog_5.14.bb</a><br>
@@ -14,6 +14,8 @@ SRC_URI = &quot;${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \<br>
           file://watchdog-init.patch \<br>
           file://watchdog-conf.patch \<br>
           file://0001-Fix-build-issues-found-with-non-glibc-C-libraries.patch \<br>
+          file://watchdog-ping.service \<br>
+          file://watchdog.service \<br>
 &quot;<br>
<br>
 SRC_URI[md5sum] = &quot;5b2dba0c593942f4acc100bca0d560c4&quot;<br>
@@ -23,7 +25,7 @@ UPSTREAM_CHECK_URI = &quot;<a href="http://sourceforge.net/projects/watchdog/files/watchdog/" rel="noreferrer" target="_blank">http://sourceforge.net/projects/watchdog/files/watchdog/</a>&quot;<br>
 UPSTREAM_CHECK_REGEX = &quot;/watchdog/(?P&lt;pver&gt;(\d+[\.\-_]*)+)/&quot;<br>
<br>
 inherit autotools<br>
-inherit update-rc.d<br>
+inherit update-rc.d systemd<br>
<br>
 DEPENDS_append_libc-musl = &quot; libtirpc &quot;<br>
 CFLAGS_append_libc-musl = &quot; -I${STAGING_INCDIR}/tirpc &quot;<br>
@@ -34,6 +36,19 @@ INITSCRIPT_PARAMS = &quot;start 15 1 2 3 4 5 . stop 85 0 6 .&quot;<br>
<br>
 RRECOMMENDS_${PN} = &quot;kernel-module-softdog&quot;<br>
<br>
+<br>
+SYSTEMD_SERVICE_${PN} = &quot;watchdog.service&quot;<br>
+<br>
 do_install_append() {<br>
        install -D ${S}/redhat/watchdog.init ${D}/${sysconfdir}/init.d/watchdog.sh<br>
+       install -d ${D}${systemd_unitdir}/system<br>
+       install -m 0644 ${WORKDIR}/watchdog*.service ${D}${systemd_unitdir}/system<br>
+<br>
+       if ${@bb.utils.contains(&#39;DISTRO_FEATURES&#39;,&#39;systemd&#39;,&#39;true&#39;,&#39;false&#39;,d)}; then<br>
+               install -d ${D}${sysconfdir}/modules-load.d<br>
+               echo &quot;softdog&quot; &gt; ${D}${sysconfdir}/modules-load.d/softdog.conf<br>
+               sed -i -e &#39;s,@SBINDIR@,${sbindir},g&#39; ${D}${systemd_unitdir}/system/*.service<br>
+       fi<br>
 }<br>
+<br>
+FILES_${PN} += &quot;${systemd_unitdir}/system/*&quot;<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.9.1<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br></div>