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"

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"
7	LICENSE = "BSD"	7	LICENSE = "BSD"
8	LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"	8	LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
9		9
10	PR = "r1"	10	PR = "r2"
11		11
12	DEPENDS = "zlib openssl"	12	DEPENDS = "zlib openssl"
13	DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"	13	DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
14		14
15	RPROVIDES = "ssh sshd"	15	RPROVIDES = "ssh sshd"
16		16
17	CONFLICTS_${PN} = "dropbear"	17	RCONFLICTS_${PN} = "dropbear"
18	RCONFLICTS_${PN}-sshd = "dropbear"	18	RCONFLICTS_${PN}-sshd = "dropbear"
19	RCONFLICTS_${PN}-keygen = "ssh-keygen"	19	RCONFLICTS_${PN}-keygen = "ssh-keygen"
20		20