summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh
diff options
context:
space:
mode:
authorZheng Junling <zhengjunling@huawei.com>2014-12-03 12:38:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-05 18:01:06 +0000
commit853e76f8bb8a82f1a8f3509a253a46df00e4b3cc (patch)
treeb565fe8b48a22754f3e166a677957256025bc9e0 /meta/recipes-connectivity/openssh
parent615fb3b2f24cd47faa2d3e29bc1eb7a500c00371 (diff)
downloadpoky-853e76f8bb8a82f1a8f3509a253a46df00e4b3cc.tar.gz
openssh: fix using the original config files in srcdir
Currently, we install our own ssh_config and sshd_config into ${S} in do_compile_append() task. So when finishing compiling, their .out files are generated by the original files, rather than by our own files. In most cases, installing "$(CONFIGFILES)" in Makefile will generate .out files again, and then installing "install-sysconf", which will install these two files into $(DESTDIR), thus we get what we expect. However, when parallel installing, "install-sysconf" may be installed before "$(CONFIGFILES)" sometimes. In this rare case, the .out files generated in the first time rather than those in the second time will be installed into $(DESTDIR), and thus we get an unexpect result. This patch fixes this bug through transfering the installing of our own files from do_compile_append() into do_configure_prepend(). (From OE-Core rev: 6a60a4ba8d8e529882daa33140c9a2fc08714fb2) Signed-off-by: Zheng Junling <zhengjunling@huawei.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh')
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.6p1.bb7
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"
74EXTRA_OECONF_append_libc-uclibc=" --without-pam" 74EXTRA_OECONF_append_libc-uclibc=" --without-pam"
75 75
76do_configure_prepend () { 76do_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
82do_compile_append () {
83 install -m 0644 ${WORKDIR}/sshd_config ${S}/
84 install -m 0644 ${WORKDIR}/ssh_config ${S}/
85}
86
87do_install_append () { 84do_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