summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2012-12-19 09:11:16 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-12-19 11:23:09 +0100
commit96e9200c5c84b4bfde40e0b7a87569c0564d6c6c (patch)
tree8a78af0671dec6c06a016ba2b5ac7d3dad6d3068
parent2fb99d3d657e6689733535628ec9882aad307392 (diff)
downloadptxdist-96e9200c5c84b4bfde40e0b7a87569c0564d6c6c.tar.gz
ptxdist-96e9200c5c84b4bfde40e0b7a87569c0564d6c6c.tar.xz
dropbear: conflict with openssh scp
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/dropbear.in4
1 files changed, 4 insertions, 0 deletions
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