diff options
| author |   Maxin B. John <maxin.john@intel.com> | 2018-03-16 10:38:10 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-20 09:30:18 +0000 |
| commit | 1d09eacc78ff44df54d6ace26702f4d9bf9e639c (patch) | |
| tree | 1b54f15e8715c25e577c0168344dc313e8d99fa4 /meta/recipes-extended/watchdog/watchdog_5.15.bb | |
| parent | 369c43cca4f00272e0f9eb8b939f38f00dc43cc3 (diff) | |
| download | openembedded-core-contrib-1d09eacc78ff44df54d6ace26702f4d9bf9e639c.tar.gz | |
watchdog: remove interdependencies of watchdog and wd_keepalive
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]
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended/watchdog/watchdog_5.15.bb')
| -rw-r--r-- | meta/recipes-extended/watchdog/watchdog_5.15.bb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-extended/watchdog/watchdog_5.15.bb b/meta/recipes-extended/watchdog/watchdog_5.15.bb index 3d0b72e08d..37b37ae12f 100644 --- a/meta/recipes-extended/watchdog/watchdog_5.15.bb +++ b/meta/recipes-extended/watchdog/watchdog_5.15.bb @@ -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 \ " |