Patchwork dropbear: pass SFTPSERVER_PATH explicitly

login
register
mail settings
Submitter rongqing.li@windriver.com
Date Sept. 26, 2013, 1:56 a.m.
Message ID <1380160568-1577-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/58993/
State Accepted
Commit 9f3706fcb4e6c731ecdfe557919992f5f2b3cd2b
Headers show

Comments

rongqing.li@windriver.com - Sept. 26, 2013, 1:56 a.m.
From: Roy Li <rongqing.li@windriver.com>

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>
---
 meta/recipes-core/dropbear/dropbear.inc |    1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index be93d60..9498bf8 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} \