aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorYousong Zhou <yszhou4tech@gmail.com>2018-06-25 13:16:09 +0800
committerJo-Philipp Wich <jo@mein.io>2018-12-18 09:44:00 +0100
commit9f8f5d4d142ad14d9ed68f79e051d8007fb2ef89 (patch)
tree465d1214109b49cbaa012fe129f8934ee6f8b6ea /package/network
parent32b18f6e211e2699de2b9a8be94f91e0890c562d (diff)
downloadupstream-9f8f5d4d142ad14d9ed68f79e051d8007fb2ef89.tar.gz
upstream-9f8f5d4d142ad14d9ed68f79e051d8007fb2ef89.tar.bz2
upstream-9f8f5d4d142ad14d9ed68f79e051d8007fb2ef89.zip
dropbear: let opkg manage symlinks of ssh, scp
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> (backported from c4aadbdaf69bad3fbb3ef54601a3629ba24a6e9b)
Diffstat (limited to 'package/network')
-rw-r--r--package/network/services/dropbear/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile
index d221fbc7ed..742e538ff5 100644
--- a/package/network/services/dropbear/Makefile
+++ b/package/network/services/dropbear/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear
PKG_VERSION:=2017.75
-PKG_RELEASE:=5.1
+PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \
@@ -49,6 +49,10 @@ 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 \
+
endef
define Package/dropbear/description
@@ -131,8 +135,6 @@ define Package/dropbear/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearmulti $(1)/usr/sbin/dropbear
$(INSTALL_DIR) $(1)/usr/bin
- $(LN) ../sbin/dropbear $(1)/usr/bin/scp
- $(LN) ../sbin/dropbear $(1)/usr/bin/ssh
$(LN) ../sbin/dropbear $(1)/usr/bin/dbclient
$(LN) ../sbin/dropbear $(1)/usr/bin/dropbearkey
$(INSTALL_DIR) $(1)/etc/config