From: Rui Salvaterra <rsalvaterra@gmail.com>
Date: Mon, 20 Jul 2020 22:26:42 +0000 (+0100)
Subject: dropbear: fix ssh alternative when dbclient isn't built
X-Git-Tag: v21.02.0-rc1~1897
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e5eeb34a8cde8c91e86dc2bdee98d693db4822cf;p=openwrt%2Fstaging%2Fchunkeey.git

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>
---

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