diff options
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh_6.6p1.bb')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_6.6p1.bb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb index d3bab3eea1..8f32c2e63e 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb | |||
@@ -10,13 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" | |||
10 | DEPENDS = "zlib openssl" | 10 | DEPENDS = "zlib openssl" |
11 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 11 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
12 | 12 | ||
13 | RPROVIDES_${PN}-ssh = "ssh" | ||
14 | RPROVIDES_${PN}-sshd = "sshd" | ||
15 | |||
16 | RCONFLICTS_${PN} = "dropbear" | ||
17 | RCONFLICTS_${PN}-sshd = "dropbear" | ||
18 | RCONFLICTS_${PN}-keygen = "ssh-keygen" | ||
19 | |||
20 | SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ | 13 | SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ |
21 | file://nostrip.patch \ | 14 | file://nostrip.patch \ |
22 | file://sshd_config \ | 15 | file://sshd_config \ |
@@ -143,6 +136,13 @@ RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" | |||
143 | RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" | 136 | RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" |
144 | RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make" | 137 | RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make" |
145 | 138 | ||
139 | RPROVIDES_${PN}-ssh = "ssh" | ||
140 | RPROVIDES_${PN}-sshd = "sshd" | ||
141 | |||
142 | RCONFLICTS_${PN} = "dropbear" | ||
143 | RCONFLICTS_${PN}-sshd = "dropbear" | ||
144 | RCONFLICTS_${PN}-keygen = "ssh-keygen" | ||
145 | |||
146 | CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" | 146 | CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" |
147 | CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" | 147 | CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" |
148 | 148 | ||