<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:宋体;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:宋体;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
@font-face
{font-family:"\@宋体";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
{mso-style-priority:99;
mso-style-link:"Balloon Text Char";
margin:0in;
margin-bottom:.0001pt;
font-size:8.0pt;
font-family:"Tahoma","sans-serif";}
span.BalloonTextChar
{mso-style-name:"Balloon Text Char";
mso-style-priority:99;
mso-style-link:"Balloon Text";
font-family:"Tahoma","sans-serif";}
span.hoenzb
{mso-style-name:hoenzb;}
span.EmailStyle20
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;
font-family:"Calibri","sans-serif";}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.25in 1.0in 1.25in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Hi,<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">I’m taking care this of, I will change to use systemd_system_unitdir instead<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">and remove ControlGroup in the service files since it has been deprecated.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Thanks,<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Jackie<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt">
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">
<a href="mailto:openembedded-core-bounces@lists.openembedded.org">openembedded-core-bounces@lists.openembedded.org</a> [<a href="mailto:openembedded-core-bounces@lists.openembedded.org">mailto:openembedded-core-bounces@lists.openembedded.org</a>]
<b>On Behalf Of </b>Pau Espin Pedrol<br>
<b>Sent:</b> Wednesday, February 03, 2016 6:26 AM<br>
<b>To:</b> Li, Rongqing<br>
<b>Cc:</b> OE-core<br>
<b>Subject:</b> Re: [OE-core] [PATCH] [v2] watchdog: enable systemd support<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<div>
<p class="MsoNormal">Hi,<o:p></o:p></p>
</div>
<p class="MsoNormal">Please could you use ${systemd_system_unitdir} instead of ${systemd_unitdir}/system ?<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><br clear="all">
<o:p></o:p></p>
<div>
<div>
<p class="MsoNormal">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><o:p></o:p></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">2016-01-25 3:48 GMT+01:00 <<a href="mailto:rongqing.li@windriver.com" target="_blank">rongqing.li@windriver.com</a>>:<o:p></o:p></p>
<p class="MsoNormal">From: Roy Li <<a href="mailto:rongqing.li@windriver.com">rongqing.li@windriver.com</a>><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 <<a href="mailto:rongqing.li@windriver.com">rongqing.li@windriver.com</a>><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" 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" target="_blank">watchdog_5.14.bb</a> b/meta/recipes-extended/watchdog/<a href="http://watchdog_5.14.bb" 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" target="_blank">watchdog_5.14.bb</a><br>
+++ b/meta/recipes-extended/watchdog/<a href="http://watchdog_5.14.bb" target="_blank">watchdog_5.14.bb</a><br>
@@ -14,6 +14,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \<br>
<a href="file:///\\watchdog-init.patch">file://watchdog-init.patch</a> \<br>
<a href="file:///\\watchdog-conf.patch">file://watchdog-conf.patch</a> \<br>
<a href="file:///\\0001-Fix-build-issues-found-with-non-glibc-C-libraries.patch">file://0001-Fix-build-issues-found-with-non-glibc-C-libraries.patch</a> \<br>
+ <a href="file:///\\watchdog-ping.service">file://watchdog-ping.service</a> \<br>
+ <a href="file:///\\watchdog.service">file://watchdog.service</a> \<br>
"<br>
<br>
SRC_URI[md5sum] = "5b2dba0c593942f4acc100bca0d560c4"<br>
@@ -23,7 +25,7 @@ UPSTREAM_CHECK_URI = "<a href="http://sourceforge.net/projects/watchdog/files/watchdog/" target="_blank">http://sourceforge.net/projects/watchdog/files/watchdog/</a>"<br>
UPSTREAM_CHECK_REGEX = "/watchdog/(?P<pver>(\d+[\.\-_]*)+)/"<br>
<br>
inherit autotools<br>
-inherit update-rc.d<br>
+inherit update-rc.d systemd<br>
<br>
DEPENDS_append_libc-musl = " libtirpc "<br>
CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc "<br>
@@ -34,6 +36,19 @@ INITSCRIPT_PARAMS = "start 15 1 2 3 4 5 . stop 85 0 6 ."<br>
<br>
RRECOMMENDS_${PN} = "kernel-module-softdog"<br>
<br>
+<br>
+SYSTEMD_SERVICE_${PN} = "watchdog.service"<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 <a href="mailto:$%7b@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)%7d">
${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}</a>; then<br>
+ install -d ${D}${sysconfdir}/modules-load.d<br>
+ echo "softdog" > ${D}${sysconfdir}/modules-load.d/softdog.conf<br>
+ sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/*.service<br>
+ fi<br>
}<br>
+<br>
+FILES_${PN} += "${systemd_unitdir}/system/*"<br>
<span class="hoenzb"><span style="color:#888888">--</span></span><span style="color:#888888"><br>
<span class="hoenzb">1.9.1</span><br>
<br>
<span class="hoenzb">--</span><br>
<span class="hoenzb">_______________________________________________</span><br>
<span class="hoenzb">Openembedded-core mailing list</span><br>
</span><a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><span style="color:#888888"><br>
</span><a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><o:p></o:p></p>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
</div>
</body>
</html>