diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2014-01-25 13:16:51 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-09 09:40:00 +0000 |
| commit | 231634db08f63d781545fd80bf16dd54c546e0c4 (patch) | |
| tree | 5989c3950abbb232ee938b8afa8c57a6cd52daa4 /meta | |
| parent | 4a85e2698e824fceeecaf4fb98bf6c7047f6ae93 (diff) | |
| download | poky-231634db08f63d781545fd80bf16dd54c546e0c4.tar.gz | |
openssh: package sshd PAM config inside openssh-sshd package
Without this PAM integration is broken after installing openssh-sshd
(From OE-Core rev: 2ba31c0f0fad6a1917e282dc381e8632db08200c)
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_6.4p1.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb index 5c1d83b3b9..892b6dcb7e 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.4p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.4p1.bb | |||
| @@ -115,7 +115,7 @@ PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc $ | |||
| 115 | FILES_${PN}-scp = "${bindir}/scp.${BPN}" | 115 | FILES_${PN}-scp = "${bindir}/scp.${BPN}" |
| 116 | FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" | 116 | FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" |
| 117 | FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system" | 117 | FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system" |
| 118 | FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd" | 118 | FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd" |
| 119 | FILES_${PN}-sftp = "${bindir}/sftp" | 119 | FILES_${PN}-sftp = "${bindir}/sftp" |
| 120 | FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" | 120 | FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" |
| 121 | FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" | 121 | FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" |