From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Mon, 20 Jun 2022 08:20:49 +0200
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1o3AmG-007o4X-Ao
	for lore@lore.pengutronix.de; Mon, 20 Jun 2022 08:20:49 +0200
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1o3AmG-0005BZ-Nk; Mon, 20 Jun 2022 08:20:48 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1o3Aky-0004Ql-MO; Mon, 20 Jun 2022 08:19:28 +0200
Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1o3Akw-001afR-3K; Mon, 20 Jun 2022 08:19:27 +0200
Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1o3Akw-006Ftm-Sn; Mon, 20 Jun 2022 08:19:26 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Mon, 20 Jun 2022 08:19:26 +0200
Message-Id: <20220620061926.1491039-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220429090950.19891-1-abbotti@mev.co.uk>
References: <20220429090950.19891-1-abbotti@mev.co.uk>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] dropbear: set sftp-server path to match
 installed location
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Ian Abbott <abbotti@mev.co.uk>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as a05703d36a6b2d829b7c53a0bb18b00247a534d8.

Michael

[sent from post-receive hook]

On Mon, 20 Jun 2022 08:19:26 +0200, Ian Abbott <abbotti@mev.co.uk> wrote:
> PTXdist installs sftp-server to /usr/sbin/sftp-server, but dropbear
> looks for it at /usr/libexec/sftp-server by default.  Set the
> SFTPSERVER_PATH macro in the localoptions.h to make dropbear look for it
> in the installed location.
> 
> Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
> Message-Id: <20220429090950.19891-1-abbotti@mev.co.uk>
> Reviewed-by: Alexander Dahl <ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/dropbear.make b/rules/dropbear.make
> index 678bd7d85778..0664532592a4 100644
> --- a/rules/dropbear.make
> +++ b/rules/dropbear.make
> @@ -255,6 +255,10 @@ else
>  	@echo "#define DROPBEAR_CLI_PUBKEY_AUTH 0" >> $(DROPBEAR_LOCALOPTIONS)
>  endif
>  
> +# match ptxdist sftp-server installation path
> +	@echo "ptxdist: setting sftp-server path"
> +	@echo '#define SFTPSERVER_PATH "/usr/sbin/sftp-server"' >> $(DROPBEAR_LOCALOPTIONS)
> +
>  	@$(call touch)
>  
>  DROPBEAR_MAKE_OPT	:= all scp