aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2013-09-26 09:56:08 +0800
committerPaul Eggleton <paul.eggleton@linux.intel.com>2013-12-03 16:49:23 +0000
commit0e599ecaa6aa5668c609cfc520398e2509c1292d (patch)
tree8958b41e34a6109dca5585a32461d1f292780b17
parent51008a21629561c8d40a7addcddde6c2be176e90 (diff)
downloadopenembedded-core-0e599ecaa6aa5668c609cfc520398e2509c1292d.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 master rev: 5f6deb044226885912214532cebb1d871f03c53a) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 e0d15e674a..14fb1a9642 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -41,6 +41,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} \