aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2020-07-20 23:26:42 +0100
committerHans Dedecker <dedeckeh@gmail.com>2020-08-12 21:57:37 +0200
commite5eeb34a8cde8c91e86dc2bdee98d693db4822cf (patch)
tree71a925ee67b56e8f55afe6efb201de35ae23b6d4
parent6e7f40dff3aa3fdbc012d0d9f79a3decdbe3735f (diff)
downloadupstream-e5eeb34a8cde8c91e86dc2bdee98d693db4822cf.tar.gz
upstream-e5eeb34a8cde8c91e86dc2bdee98d693db4822cf.tar.bz2
upstream-e5eeb34a8cde8c91e86dc2bdee98d693db4822cf.zip
dropbear: fix ssh alternative when dbclient isn't built
The ssh symlink was still being created even when dbclient was disabled in the build configuration. Fix this annoyance. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
-rw-r--r--package/network/services/dropbear/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile
index 0a9b5c0a99..bedb000fda 100644
--- a/package/network/services/dropbear/Makefile
+++ b/package/network/services/dropbear/Makefile
@@ -53,9 +53,9 @@ define Package/dropbear
CATEGORY:=Base system
TITLE:=Small SSH2 client/server
DEPENDS:= +DROPBEAR_ZLIB:zlib
- ALTERNATIVES:=\
- 100:/usr/bin/ssh:/usr/sbin/dropbear \
- 100:/usr/bin/scp:/usr/sbin/dropbear \
+ ALTERNATIVES:=100:/usr/bin/scp:/usr/sbin/dropbear
+ $(if $(CONFIG_DROPBEAR_DBCLIENT),ALTERNATIVES+= \
+ 100:/usr/bin/ssh:/usr/sbin/dropbear,)
endef