diff options
| author | Dominic Sacré <dominic.sacre@gmx.de> | 2016-05-25 13:13:44 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-30 15:58:12 +0100 |
| commit | 52d130d9e9735af569f018fc9161a54ed198d2d4 (patch) | |
| tree | 3d9a248d0737477442aa5239dfaafd030cf9632e /meta | |
| parent | 1eca8ea3f78d72119e00ce9725e3ee5802d73eb8 (diff) | |
| download | poky-52d130d9e9735af569f018fc9161a54ed198d2d4.tar.gz | |
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.
(From OE-Core rev: df798bca330583103b2301678236cc841cc861dd)
Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 1 |
1 files changed, 0 insertions, 1 deletions
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" | |||
| 46 | EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' | 46 | EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' |
| 47 | EXTRA_OECONF += "\ | 47 | EXTRA_OECONF += "\ |
| 48 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" | 48 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" |
| 49 | CFLAGS += "-DSFTPSERVER_PATH=\\"${libdir}/openssh/sftp-server\\"" | ||
| 50 | 49 | ||
| 51 | do_install() { | 50 | do_install() { |
| 52 | install -d ${D}${sysconfdir} \ | 51 | install -d ${D}${sysconfdir} \ |