[openwrt/openwrt] dropbear: fix ssh alternative when dbclient isn't built

LEDE Commits lede-commits at lists.infradead.org
Wed Aug 12 15:57:41 EDT 2020


dedeckeh pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/e5eeb34a8cde8c91e86dc2bdee98d693db4822cf

commit e5eeb34a8cde8c91e86dc2bdee98d693db4822cf
Author: Rui Salvaterra <rsalvaterra at gmail.com>
AuthorDate: Mon Jul 20 23:26:42 2020 +0100

    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 at gmail.com>
---
 package/network/services/dropbear/Makefile | 6 +++---
 1 file 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
 



More information about the lede-commits mailing list