]> code.ossystems Code Review - openembedded-core.git/commitdiff
dropbear: Remove incorrect SFTPSERVER_PATH from CFLAGS
authorDominic Sacré <dominic.sacre@gmx.de>
Wed, 25 May 2016 11:13:44 +0000 (13:13 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 30 May 2016 08:30:31 +0000 (09:30 +0100)
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>
meta/recipes-core/dropbear/dropbear.inc

index 1dce2a5ff6a8124b0b603238c646936423faba92..923d31c3072f10138efe9a6e22c44b45cb9b2bc3 100644 (file)
@@ -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} \