From: Dominic Sacré <dominic.sacre@gmx.de>
Date: Wed, 25 May 2016 11:13:44 +0000 (+0200)
Subject: dropbear: Remove incorrect SFTPSERVER_PATH from CFLAGS
X-Git-Tag: uninative-1.3~944
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=df798bca330583103b2301678236cc841cc861dd;p=openembedded-core.git

dropbear: Remove incorrect SFTPSERVER_PATH from CFLAGS

Openssh now installs the sftp-server binary as /usr/libexec/sftp-server,
whereas the dropbear recipe assumes a different path.
Dropbear uses the correct path by default, so it's no longer necessary
to override SFTPSERVER_PATH via CFLAGS.

This fixes SFTP access to systems using dropbear as the SSH server.

Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 1dce2a5ff6..923d31c307 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -46,7 +46,6 @@ BINCOMMANDS = "dbclient ssh scp"
 EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
 EXTRA_OECONF += "\
  ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
-CFLAGS += "-DSFTPSERVER_PATH=\\"${libdir}/openssh/sftp-server\\""
 
 do_install() {
 	install -d ${D}${sysconfdir} \