summaryrefslogtreecommitdiffstats
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-09 09:40:00 +0000
commitb1d29ef805eebfb74a323277734cdd1f0341d7fe (patch)
treecf330566aef754f95c12cb00aa08fc5301592e1c
parent231634db08f63d781545fd80bf16dd54c546e0c4 (diff)
downloadpoky-b1d29ef805eebfb74a323277734cdd1f0341d7fe.tar.gz
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. (From OE-Core rev: b2f49f9d2d8cd033611108c2bfe4871d02df0887) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 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.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*"
122FILES_${PN}-keygen = "${bindir}/ssh-keygen" 122FILES_${PN}-keygen = "${bindir}/ssh-keygen"
123 123
124RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" 124RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
125RDEPENDS_${PN}-sshd += "${PN}-keygen" 125RDEPENDS_${PN}-sshd += "${PN}-keygen ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}"
126
126 127
127CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" 128CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
128CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" 129CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config"