diff options
| author |   Fabio Berton <fabio.berton@ossystems.com.br> | 2017-01-25 09:22:05 -0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-15 20:06:29 -0800 |
| commit | 35e36f7f2d1f7e3ef70ba473a91fb6f946752f1b (patch) | |
| tree | e17c52746a3b6423a802f72c7997c971b8ec57ae | |
| parent | 092954cf2fba5020443f09c8e1fbc1788f704f10 (diff) | |
| download | openembedded-core-contrib-35e36f7f2d1f7e3ef70ba473a91fb6f946752f1b.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.
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | 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 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 = " \ ${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" |