[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4604/8267] watchdog: Add RCONFLICTS to watchdog-keepalive and split RDEPENDS

[Emmanuele Bassi <ebassi src gnome org>]

commit e051c702503614b45d68f4c4c10ed413b2ea5c66
Author: Fabio Berton <fabio berton ossystems com br>
Date:   Wed Jan 25 09:22:05 2017 -0200

    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>

 meta/recipes-extended/watchdog/watchdog_5.15.bb |    9 +++++----
 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 cedfc04..9659f27 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"