From 43a2d098008eee711399b8d64594d84ae034b9bf Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Thu, 10 Mar 2011 16:06:16 -0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssh/openssh_5.6p1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-connectivity/openssh') 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" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=7ae09218173be1643c998a4b71027f9b" -PR = "r0" +PR = "r1" DEPENDS = "zlib openssl" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" @@ -67,6 +67,8 @@ do_install_append () { rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var } +ALLOW_EMPTY_${PN} = "1" + PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" FILES_${PN}-scp = "${bindir}/scp.${PN}" FILES_${PN}-ssh = "${bindir}/ssh.${PN} ${sysconfdir}/ssh/ssh_config" -- cgit v1.2.3-54-g00ecf