summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dropbear
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-26 17:49:29 +0100
commit5f6deb044226885912214532cebb1d871f03c53a (patch)
treecce8c5a75f0ac580aaa672f0aa9e363587db9f86 /meta/recipes-core/dropbear
parent3f302e6686e9c35d3fd771b8aed214bf739e59f6 (diff)
downloadopenembedded-core-contrib-5f6deb044226885912214532cebb1d871f03c53a.tar.gz
openembedded-core-contrib-5f6deb044226885912214532cebb1d871f03c53a.tar.bz2
openembedded-core-contrib-5f6deb044226885912214532cebb1d871f03c53a.zip
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. Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dropbear')
-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"
EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
EXTRA_OECONF += "\
${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
+CFLAGS += "-DSFTPSERVER_PATH=\\"${libdir}/openssh/sftp-server\\""
do_install() {
install -d ${D}${sysconfdir} \