summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-05-06 14:19:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-15 23:24:43 +0100
commit0158dea3a5bfec2c3669ee3894f95e586cccc131 (patch)
tree664886e2c19d9f1ea7320c3cea2b3f8b73906718
parent944e261839bc342f19f8ced58bd7bc73e6f33e11 (diff)
downloadpoky-0158dea3a5bfec2c3669ee3894f95e586cccc131.tar.gz
openssh: move packaging definitions to the end
(From OE-Core rev: 19efeb598c5fb527bd5bc473d7a7d78242ec05a0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.6p1.bb14
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"
10DEPENDS = "zlib openssl" 10DEPENDS = "zlib openssl"
11DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 11DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
12 12
13RPROVIDES_${PN}-ssh = "ssh"
14RPROVIDES_${PN}-sshd = "sshd"
15
16RCONFLICTS_${PN} = "dropbear"
17RCONFLICTS_${PN}-sshd = "dropbear"
18RCONFLICTS_${PN}-keygen = "ssh-keygen"
19
20SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ 13SRC_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"
143RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" 136RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}"
144RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make" 137RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make"
145 138
139RPROVIDES_${PN}-ssh = "ssh"
140RPROVIDES_${PN}-sshd = "sshd"
141
142RCONFLICTS_${PN} = "dropbear"
143RCONFLICTS_${PN}-sshd = "dropbear"
144RCONFLICTS_${PN}-keygen = "ssh-keygen"
145
146CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" 146CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
147CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" 147CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config"
148 148