diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-06-16 20:08:18 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-18 13:18:40 +0100 |
commit | fbcda6eff010e0a39cc0145a514e7de99f475145 (patch) | |
tree | a64d1731bd75f4f5951ec43ba73c4870ee896faa /meta/recipes-connectivity/openssh | |
parent | abd5d5a712686a379a1a1da29d78a0f374f13e33 (diff) | |
download | openembedded-core-fbcda6eff010e0a39cc0145a514e7de99f475145.tar.gz openembedded-core-fbcda6eff010e0a39cc0145a514e7de99f475145.tar.bz2 openembedded-core-fbcda6eff010e0a39cc0145a514e7de99f475145.zip |
recipes: replace CONFLICTS with RCONFLICTS_${PN}
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.bb | 4 |
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" 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" |