summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-06-16 20:08:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-18 13:24:58 +0100
commit79e4de84063cdd3d8eab65ae93d9c896829212e8 (patch)
tree215ff9e216b02a672eddb0d0708c370f77805e9f /meta/recipes-connectivity/openssh
parent0529f93440b2d67af8b2272b4d18220ae94e91d8 (diff)
downloadpoky-79e4de84063cdd3d8eab65ae93d9c896829212e8.tar.gz
recipes: replace CONFLICTS with RCONFLICTS_${PN}
(From OE-Core rev: fbcda6eff010e0a39cc0145a514e7de99f475145) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh')
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.0p1.bb4
1 files changed, 2 insertions, 2 deletions
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"
7LICENSE = "BSD" 7LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" 8LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
9 9
10PR = "r1" 10PR = "r2"
11 11
12DEPENDS = "zlib openssl" 12DEPENDS = "zlib openssl"
13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
14 14
15RPROVIDES = "ssh sshd" 15RPROVIDES = "ssh sshd"
16 16
17CONFLICTS_${PN} = "dropbear" 17RCONFLICTS_${PN} = "dropbear"
18RCONFLICTS_${PN}-sshd = "dropbear" 18RCONFLICTS_${PN}-sshd = "dropbear"
19RCONFLICTS_${PN}-keygen = "ssh-keygen" 19RCONFLICTS_${PN}-keygen = "ssh-keygen"
20 20