summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2017-01-25 09:22:05 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-15 20:06:42 -0800
commite051c702503614b45d68f4c4c10ed413b2ea5c66 (patch)
treed2b0fe9b4c4aca0c63c2a7c97a1102e9b2e1c995
parente380d55c1d554ccb4a301d49796ab482d6f0286f (diff)
downloadpoky-e051c702503614b45d68f4c4c10ed413b2ea5c66.tar.gz
watchdog: Add RCONFLICTS to watchdog-keepalive and split RDEPENDS
watchdog-keepalive is a simplified version of the watchdog daemon and can't be installed along with watchdog daemon, we need to choose which daemon install. (From OE-Core rev: 35e36f7f2d1f7e3ef70ba473a91fb6f946752f1b) Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/watchdog/watchdog_5.15.bb9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-extended/watchdog/watchdog_5.15.bb b/meta/recipes-extended/watchdog/watchdog_5.15.bb
index cedfc042ce..9659f27df5 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.15.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.15.bb
@@ -52,8 +52,9 @@ FILES_${PN}-keepalive = " \
52 ${sbindir}/wd_keepalive \ 52 ${sbindir}/wd_keepalive \
53" 53"
54 54
55RDEPENDS_${PN} += "${PN}-config ${PN}-keepalive" 55RDEPENDS_${PN} += "${PN}-config"
56RDEPENDS_${PN}-keepalive += "${PN}-config" 56RRECOMMENDS_${PN} += "kernel-module-softdog"
57
58RRECOMMENDS_${PN} = "kernel-module-softdog"
59 57
58RDEPENDS_${PN}-keepalive += "${PN}-config"
59RCONFLICTS_${PN}-keepalive += "${PN}"
60RRECOMMENDS_${PN}-keepalive += "kernel-module-softdog"