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>
This commit is contained in:
parent
e380d55c1d
commit
e051c70250
|
@ -52,8 +52,9 @@ FILES_${PN}-keepalive = " \
|
|||
${sbindir}/wd_keepalive \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN} += "${PN}-config ${PN}-keepalive"
|
||||
RDEPENDS_${PN} += "${PN}-config"
|
||||
RRECOMMENDS_${PN} += "kernel-module-softdog"
|
||||
|
||||
RDEPENDS_${PN}-keepalive += "${PN}-config"
|
||||
|
||||
RRECOMMENDS_${PN} = "kernel-module-softdog"
|
||||
|
||||
RCONFLICTS_${PN}-keepalive += "${PN}"
|
||||
RRECOMMENDS_${PN}-keepalive += "kernel-module-softdog"
|
||||
|
|
Loading…
Reference in New Issue