From fbcda6eff010e0a39cc0145a514e7de99f475145 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Jun 2012 20:08:18 +0200 Subject: recipes: replace CONFLICTS with RCONFLICTS_${PN} Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssh/openssh_6.0p1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-connectivity/openssh') diff --git a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb index 04fd6a9c69..376023c635 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb @@ -7,14 +7,14 @@ SECTION = "console/network" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" -PR = "r1" +PR = "r2" DEPENDS = "zlib openssl" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RPROVIDES = "ssh sshd" -CONFLICTS_${PN} = "dropbear" +RCONFLICTS_${PN} = "dropbear" RCONFLICTS_${PN}-sshd = "dropbear" RCONFLICTS_${PN}-keygen = "ssh-keygen" -- cgit 1.2.3-korg