mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

watchdog: remove interdependencies of watchdog and wd_keepalive

Browse Source 
Since watchdog and watchdog-keepalive packages can't be installed
together, move wd_keepalive.service to watchdog-keepalive package.

Remove the inter-dependencies of watchdog and wd_keepalive
services as well.

[YOCTO #12565]

(From OE-Core rev: 1d09eacc78ff44df54d6ace26702f4d9bf9e639c)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Maxin B. John
2018-03-16 10:38:10 +02:00
committed by Richard Purdie
parent eeafb85124
commit c3c336f106
2 changed files with 73 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch
+68
View File
@@ -0,0 +1,68 @@
From c1fe14fa5bd168292cc4670034bc48b954e9dac7 Mon Sep 17 00:00:00 2001
From: "Maxin B. John" <maxin.john@intel.com>
Date: Tue, 13 Mar 2018 14:49:55 +0200
Subject: [PATCH] watchdog: remove interdependencies of watchdog and
wd_keepalive services
Since watchdog and watchdog-keepalive packages can't be installed
together, remove the inter-dependencies of watchdog and wd_keepalive
services
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
debian/watchdog.service | 9 +++------
debian/wd_keepalive.service | 10 +++++-----
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/debian/watchdog.service b/debian/watchdog.service
index 7a2fc36..f31d1fe 100644
--- a/debian/watchdog.service
+++ b/debian/watchdog.service
@@ -1,16 +1,13 @@
[Unit]
Description=watchdog daemon
-Conflicts=wd_keepalive.service
After=multi-user.target
-OnFailure=wd_keepalive.service
[Service]
Type=forking
EnvironmentFile=/etc/default/watchdog
ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module'
-ExecStart=/bin/sh -c '[ $run_watchdog != 1 ] || exec /usr/sbin/watchdog $watchdog_options'
-ExecStopPost=/bin/sh -c '[ $run_wd_keepalive != 1 ] || false'
+ExecStart=/bin/sh -c '[ x$run_watchdog != x1 ] || exec /usr/sbin/watchdog $watchdog_options'
+PIDFile=/var/run/watchdog.pid
[Install]
-WantedBy=default.target
-
+WantedBy=multi-user.target
diff --git a/debian/wd_keepalive.service b/debian/wd_keepalive.service
index 45b018e..7f8b1dc 100644
--- a/debian/wd_keepalive.service
+++ b/debian/wd_keepalive.service
@@ -1,13 +1,13 @@
[Unit]
Description=watchdog keepalive daemon
-Before=watchdog.service shutdown.target
-Conflicts=watchdog.service shutdown.target
+After=multi-user.target
[Service]
Type=forking
EnvironmentFile=/etc/default/watchdog
ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module'
-ExecStartPre=-/bin/systemctl reset-failed watchdog.service
ExecStart=/usr/sbin/wd_keepalive $watchdog_options
-ExecStartPost=/bin/sh -c 'ln -s /var/run/wd_keepalive.pid /run/sendsigs.omit.d/wd_keepalive.pid'
-ExecStopPost=/bin/sh -c 'rm -f /run/sendsigs.omit.d/wd_keepalive.pid'
+PIDFile=/var/run/wd_keepalive.pid
+
+[Install]
+WantedBy=multi-user.target
--
2.4.0
meta/recipes-extended/watchdog/watchdog_5.15.bb
+5 -1
View File
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ecc0551bf54ad97f6b541720f84d6569"
SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
file://0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch \
file://0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch \
file://watchdog-init.patch \
file://watchdog-conf.patch \
file://wd_keepalive.init \
@@ -36,7 +37,9 @@ 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"
SYSTEMD_PACKAGES = "${PN} ${PN}-keepalive"
SYSTEMD_SERVICE_${PN} = "watchdog.service"
SYSTEMD_SERVICE_${PN}-keepalive = "wd_keepalive.service"
do_install_append() {
install -d ${D}${systemd_system_unitdir}
@@ -54,6 +57,7 @@ PACKAGES =+ "${PN}-keepalive"
FILES_${PN}-keepalive = " \
${sysconfdir}/init.d/wd_keepalive \
${systemd_system_unitdir}/wd_keepalive.service \
${sbindir}/wd_keepalive \
"