Skip to contentSkip to conversation

watchdog: enable systemd support

PATCH In review [email protected] 2 participants 4 messages Aug 22, 2017 – Aug 29, 2017

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover watchdog: enable systemd support

From: Kai Kang <[email protected]>

The following changes since commit 04dc76713b57f28457742dd863caa663591d4866:

devtool/copy_buildsystem: adds meta-skeleton layer in the eSDK installation. (2017-08-19 22:15:39 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib kangkai/watchdog
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/watchdog

Kai Kang (1):
watchdog: enable systemd support

 meta/recipes-extended/watchdog/watchdog_5.15.bb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
Signature · 1 line
2.10.1
author
#1 lore raw

PATCH 1/1 watchdog: enable systemd support

From: Kai Kang <[email protected]>

Inherit systemd.bbclass to enable systemd support for watchdog.

And fix indentation of do_install_append() as well according to:
https://www.openembedded.org/wiki/Styleguide#Format_Guidelines

Signed-off-by Kai Kang <[email protected]>
---
 meta/recipes-extended/watchdog/watchdog_5.15.bb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
meta/recipes-extended/watchdog/watchdog_5.15.bb +10 -5
index 9659f27..3d0b72e 100644
@@ -21,8 +21,7 @@ SRC_URI[sha256sum] = "ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/watchdog/files/watchdog/"
 UPSTREAM_CHECK_REGEX = "/watchdog/(?P<pver>(\d+[\.\-_]*)+)/"
 
-inherit autotools
-inherit update-rc.d
+inherit autotools update-rc.d systemd
 
 DEPENDS_append_libc-musl = " libtirpc "
 CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc "

@@ -37,12 +36,18 @@ INITSCRIPT_PARAMS_${PN} = "start 15 1 2 3 4 5 . stop 85 0 6 ."
 INITSCRIPT_NAME_${PN}-keepalive = "wd_keepalive"
 INITSCRIPT_PARAMS_${PN}-keepalive = "start 15 1 2 3 4 5 . stop 85 0 6 ."
 
+SYSTEMD_SERVICE_${PN} = "watchdog.service wd_keepalive.service"
+
 do_install_append() {
+	install -d ${D}${systemd_system_unitdir}
+	install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir}
+	install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir}
+
 	install -D ${S}/redhat/watchdog.init ${D}/${sysconfdir}/init.d/watchdog.sh
-    install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive
+	install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive
 
-    # watchdog.conf is provided by the watchdog-config recipe
-    rm ${D}${sysconfdir}/watchdog.conf
+	# watchdog.conf is provided by the watchdog-config recipe
+	rm ${D}${sysconfdir}/watchdog.conf
 }
 
 PACKAGES =+ "${PN}-keepalive"
Signature · 1 line
2.10.1
author
#2 lore raw
In reply to [email protected]
Quoted 6 lines · On 2017年08月22日 16:29, [email protected] wrote:

From: Kai Kang <[email protected]>

The following changes since commit 04dc76713b57f28457742dd863caa663591d4866:

   devtool/copy_buildsystem: adds meta-skeleton layer in the eSDK installation. (2017-08-19 22:15:39 +0100)
Quoted 7 lines

are available in the git repository at:

git://git.pokylinux.org/poky-contrib kangkai/watchdog
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/watchdog

Kai Kang (1):
watchdog: enable systemd support

Ping.

--Kai

Quoted 4 lines
  meta/recipes-extended/watchdog/watchdog_5.15.bb | 15 ++++++++++-----
  1 file changed, 10 insertions(+), 5 deletions(-)
Signature · 2 lines
Regards,
Neil | Kai Kang
#3 lore raw
Quoted 10 lines · Kang Kai
Quoted 9 lines · On 2017年08月22日 16:29, [email protected] wrote:

From: Kai Kang <[email protected]>

The following changes since commit 04dc76713b57f28457742dd863caa663591d4866:

devtool/copy_buildsystem: adds meta-skeleton layer in the eSDK
installation. (2017-08-19 22:15:39 +0100)

are available in the git repository at:

Quoted 7 lines
Quoted 5 lines

git://git.pokylinux.org/poky-contrib kangkai/watchdog
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/watchdog

Kai Kang (1):
watchdog: enable systemd support

Ping.

In master-next now, perhaps due to the ping. :)

commit a30fcb95d527bc2a0981af5c1ed179a122bb055c

Author: Kai Kang <[email protected]>
Date:   Tue Aug 22 14:35:05 2017 +0800

watchdog: enable systemd support

../Randy

Quoted 10 lines

--Kai

Quoted 4 lines
  meta/recipes-extended/watchdog/watchdog_5.15.bb | 15 ++++++++++-----
  1 file changed, 10 insertions(+), 5 deletions(-)
Signature · 2 lines
# Randy MacLeod.  WR Linux
# Wind River an Intel Company