From: John Crispin Date: Thu, 31 Aug 2017 19:09:05 +0000 (+0200) Subject: Revert "dropbear: Link ssh and scp command to /bin instead of /usr/bin" X-Git-Tag: v18.06.0-rc1~2318 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=12930fc0453ac019e3f9a9cde50699914f7ba1d0;p=openwrt%2Fopenwrt.git Revert "dropbear: Link ssh and scp command to /bin instead of /usr/bin" This reverts commit f7528ed0a8586434e18e9007b1bf0d05a18d6418. Signed-off-by: John Crispin --- diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 95852baf77..7302db273c 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:=4 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -126,8 +126,8 @@ 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)/bin/scp - $(LN) ../sbin/dropbear $(1)/bin/ssh + $(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