summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2013-09-26 09:56:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-30 22:11:57 +0100
commit9f3706fcb4e6c731ecdfe557919992f5f2b3cd2b (patch)
tree296c1e55214f5ee600db4464a13497fbde0c3ee4 /meta/recipes-core
parent1abb7e7829fbe39c3abb06ea5890f3d4a83e5d63 (diff)
downloadpoky-9f3706fcb4e6c731ecdfe557919992f5f2b3cd2b.tar.gz
dropbear: pass SFTPSERVER_PATH explicitly
The default value of SFTPSERVER_PATH is "/usr/libexec/sftp-server" defined in dropbear-2013.58/option.h, but after commit 406bd38b423[bitbake.conf: change libexecdir to ${libdir}/${BPN}], sftp-server is provided by openssh package, and is installed into ${libdir}/openssh, so we pass it explicitly. (From OE-Core rev: 5f6deb044226885912214532cebb1d871f03c53a) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index be93d60595..9498bf8111 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -40,6 +40,7 @@ BINCOMMANDS = "dbclient ssh scp"
40EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' 40EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
41EXTRA_OECONF += "\ 41EXTRA_OECONF += "\
42 ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" 42 ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
43CFLAGS += "-DSFTPSERVER_PATH=\\"${libdir}/openssh/sftp-server\\""
43 44
44do_install() { 45do_install() {
45 install -d ${D}${sysconfdir} \ 46 install -d ${D}${sysconfdir} \