summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-03-11 00:06:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-11 02:46:04 (GMT)
commit43a2d098008eee711399b8d64594d84ae034b9bf (patch)
tree519f8f2eff37869cc5ebe51be43f03fb244a4dbf /meta/recipes-connectivity/openssh
parent84b877ba360a49ce710ed652e67b1c019628b4c5 (diff)
downloadpoky-43a2d098008eee711399b8d64594d84ae034b9bf.tar.gz
openssh: allow the openssh meta package to be empty
This allows the openssh meta-package to be used in the poky-ssh task. Otherwise there will be no package named openssh to install during image creation. (From OE-Core rev: 9f4747a1e7e04e0b08b7b402bd8dd7cf8ccd0166) Signed-off-by: Scott Garman <scott.a.garman@intel.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_5.6p1.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_5.6p1.bb b/meta/recipes-connectivity/openssh/openssh_5.6p1.bb
index be9ae09..d93a773 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.6p1.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
7LICENSE = "BSD" 7LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENCE;md5=7ae09218173be1643c998a4b71027f9b" 8LIC_FILES_CHKSUM = "file://LICENCE;md5=7ae09218173be1643c998a4b71027f9b"
9 9
10PR = "r0" 10PR = "r1"
11 11
12DEPENDS = "zlib openssl" 12DEPENDS = "zlib openssl"
13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -67,6 +67,8 @@ do_install_append () {
67 rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var 67 rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
68} 68}
69 69
70ALLOW_EMPTY_${PN} = "1"
71
70PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" 72PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server"
71FILES_${PN}-scp = "${bindir}/scp.${PN}" 73FILES_${PN}-scp = "${bindir}/scp.${PN}"
72FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config" 74FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config"