[oe-commits] [openembedded-core] 08/20: dropbear: add openssh/openssh-sshd as rconflict

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 0aa21ae925d81cd10d5c44d4d98c9f06df87139d
Author: Changqing Li <changqing.li at windriver.com>
AuthorDate: Tue May 28 12:01:53 2019 +0800

    dropbear: add openssh/openssh-sshd as rconflict
    
    Signed-off-by: Changqing Li <changqing.li at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/dropbear/dropbear.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 2537603..b74d186 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01"
 
 DEPENDS = "zlib virtual/crypt"
 RPROVIDES_${PN} = "ssh sshd"
+RCONFLICTS_${PN} = "openssh-sshd openssh"
 
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.