diff options
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh_6.6p1.bb')
-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 047a895aae..e4468c17c3 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb | |||
@@ -75,16 +75,13 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd" | |||
75 | EXTRA_OECONF_append_libc-uclibc=" --without-pam" | 75 | EXTRA_OECONF_append_libc-uclibc=" --without-pam" |
76 | 76 | ||
77 | do_configure_prepend () { | 77 | do_configure_prepend () { |
78 | install -m 0644 ${WORKDIR}/sshd_config ${B}/ | ||
79 | install -m 0644 ${WORKDIR}/ssh_config ${B}/ | ||
78 | if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then | 80 | if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then |
79 | cp aclocal.m4 acinclude.m4 | 81 | cp aclocal.m4 acinclude.m4 |
80 | fi | 82 | fi |
81 | } | 83 | } |
82 | 84 | ||
83 | do_compile_append () { | ||
84 | install -m 0644 ${WORKDIR}/sshd_config ${S}/ | ||
85 | install -m 0644 ${WORKDIR}/ssh_config ${S}/ | ||
86 | } | ||
87 | |||
88 | do_install_append () { | 85 | do_install_append () { |
89 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then | 86 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then |
90 | install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd | 87 | install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd |