From: Fabio Berton <fabio.berton@ossystems.com.br>
Date: Wed, 25 Jan 2017 11:22:05 +0000 (-0200)
Subject: watchdog: Add RCONFLICTS to watchdog-keepalive and split RDEPENDS
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~22529
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35e36f7f2d1f7e3ef70ba473a91fb6f946752f1b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-extended/watchdog/watchdog_5.15.bb b/meta/recipes-extended/watchdog/watchdog_5.15.bb
index cedfc042ce2..9659f27df5c 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 = " \
     ${sbindir}/wd_keepalive \
 "
 
-RDEPENDS_${PN} += "${PN}-config ${PN}-keepalive"
-RDEPENDS_${PN}-keepalive += "${PN}-config"
-
-RRECOMMENDS_${PN} = "kernel-module-softdog"
+RDEPENDS_${PN} += "${PN}-config"
+RRECOMMENDS_${PN} += "kernel-module-softdog"
 
+RDEPENDS_${PN}-keepalive += "${PN}-config"
+RCONFLICTS_${PN}-keepalive += "${PN}"
+RRECOMMENDS_${PN}-keepalive += "kernel-module-softdog"