diff options
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_6.6p1.bb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb index edae0368f9..dbcf4146ed 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb | |||
| @@ -74,16 +74,13 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd" | |||
| 74 | EXTRA_OECONF_append_libc-uclibc=" --without-pam" | 74 | EXTRA_OECONF_append_libc-uclibc=" --without-pam" |
| 75 | 75 | ||
| 76 | do_configure_prepend () { | 76 | do_configure_prepend () { |
| 77 | install -m 0644 ${WORKDIR}/sshd_config ${B}/ | ||
| 78 | install -m 0644 ${WORKDIR}/ssh_config ${B}/ | ||
| 77 | if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then | 79 | if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then |
| 78 | cp aclocal.m4 acinclude.m4 | 80 | cp aclocal.m4 acinclude.m4 |
| 79 | fi | 81 | fi |
| 80 | } | 82 | } |
| 81 | 83 | ||
| 82 | do_compile_append () { | ||
| 83 | install -m 0644 ${WORKDIR}/sshd_config ${S}/ | ||
| 84 | install -m 0644 ${WORKDIR}/ssh_config ${S}/ | ||
| 85 | } | ||
| 86 | |||
| 87 | do_install_append () { | 84 | do_install_append () { |
| 88 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then | 85 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then |
| 89 | install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd | 86 | install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd |
