From d365948ebd76625f82ef04e77d35bcfeced42fec Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 28 May 2019 12:01:53 +0800 Subject: dropbear: add openssh/openssh-sshd as rconflict (From OE-Core rev: 0aa21ae925d81cd10d5c44d4d98c9f06df87139d) Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- meta/recipes-core/dropbear/dropbear.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'meta/recipes-core/dropbear') diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 25376038f0..b74d186cd4 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)}" -- cgit v1.2.3-54-g00ecf