From 96e9200c5c84b4bfde40e0b7a87569c0564d6c6c Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Wed, 19 Dec 2012 09:11:16 +0100 Subject: dropbear: conflict with openssh scp Signed-off-by: Michael Olbrich --- rules/dropbear.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rules/dropbear.in b/rules/dropbear.in index baa87180e..16624d826 100644 --- a/rules/dropbear.in +++ b/rules/dropbear.in @@ -314,10 +314,14 @@ config DROPBEAR_DROPBEAR_CONVERT config DROPBEAR_SCP bool + depends on !OPENSSH_SCP || ALLYES prompt "Install dropbear's scp" help This is dropbear's implementation of the scp utility. +comment "OpenSSH scp is selected!" + depends on OPENSSH_SCP + comment "runtime options ---" config DROPBEAR_STARTSCRIPT -- cgit v1.2.3