diff options
Diffstat (limited to 'yocto-poky/meta/recipes-connectivity/openssh/openssh_7.1p2.bb')
| -rw-r--r-- | yocto-poky/meta/recipes-connectivity/openssh/openssh_7.1p2.bb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/yocto-poky/meta/recipes-connectivity/openssh/openssh_7.1p2.bb b/yocto-poky/meta/recipes-connectivity/openssh/openssh_7.1p2.bb index 714c3917c..3b5e28a1d 100644 --- a/yocto-poky/meta/recipes-connectivity/openssh/openssh_7.1p2.bb +++ b/yocto-poky/meta/recipes-connectivity/openssh/openssh_7.1p2.bb @@ -91,7 +91,11 @@ do_compile_ptest() { do_install_append () { if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd - sed -i -e 's:#UsePAM no:UsePAM yes:' ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config + sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config + fi + + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then + sed -i -e 's:#X11Forwarding no:X11Forwarding yes:' ${D}${sysconfdir}/ssh/sshd_config fi install -d ${D}${sysconfdir}/init.d @@ -121,7 +125,7 @@ do_install_append () { } do_install_ptest () { - sed -i -e "s|^SFTPSERVER=.*|SFTPSERVER=${libdir}/${PN}/sftp-server|" regress/test-exec.sh + sed -i -e "s|^SFTPSERVER=.*|SFTPSERVER=${libexecdir}/sftp-server|" regress/test-exec.sh cp -r regress ${D}${PTEST_PATH} } |