diff options
author | Scott Garman <scott.a.garman@intel.com> | 2011-03-10 16:06:16 -0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-03-10 21:43:05 -0800 |
commit | d16085b67b05e6c10f9e29381313e2b3370ca8ff (patch) | |
tree | c1423547b515bef02b801b4eaa3705ffeab3b102 | |
parent | 5903a8fb4fbd7cf93ef2579f43065cdfb7e15d5a (diff) | |
download | poky-d16085b67b05e6c10f9e29381313e2b3370ca8ff.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>
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_5.6p1.bb | 4 |
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 be9ae09735..d93a773f7f 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" | |||
7 | LICENSE = "BSD" | 7 | LICENSE = "BSD" |
8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=7ae09218173be1643c998a4b71027f9b" | 8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=7ae09218173be1643c998a4b71027f9b" |
9 | 9 | ||
10 | PR = "r0" | 10 | PR = "r1" |
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)}" |
@@ -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 | ||
70 | ALLOW_EMPTY_${PN} = "1" | ||
71 | |||
70 | PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" | 72 | PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" |
71 | FILES_${PN}-scp = "${bindir}/scp.${PN}" | 73 | FILES_${PN}-scp = "${bindir}/scp.${PN}" |
72 | FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config" | 74 | FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config" |