summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2014-01-25 13:16:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-08 21:00:30 +0000
commitb2f49f9d2d8cd033611108c2bfe4871d02df0887 (patch)
treec17d3dc4cf7befbbd75d01dc65cfb676bde16d43 /meta
parent2ba31c0f0fad6a1917e282dc381e8632db08200c (diff)
downloadopenembedded-core-b2f49f9d2d8cd033611108c2bfe4871d02df0887.tar.gz
openembedded-core-b2f49f9d2d8cd033611108c2bfe4871d02df0887.tar.bz2
openembedded-core-b2f49f9d2d8cd033611108c2bfe4871d02df0887.zip
openssh: drag in required PAM modules.
/etc/pam.d/opensshd lists keyinit and uid as required, so add them to RDEPENDS when PAM is enabled. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.4p1.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
index 892b6dcb7e..9c0bb4817a 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb
@@ -122,7 +122,8 @@ FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
FILES_${PN}-keygen = "${bindir}/ssh-keygen"
RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
-RDEPENDS_${PN}-sshd += "${PN}-keygen"
+RDEPENDS_${PN}-sshd += "${PN}-keygen ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}"
+
CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config"