[source] Revert "dropbear: Link ssh and scp command to /bin instead of /usr/bin"

LEDE Commits lede-commits at lists.infradead.org
Thu Aug 31 12:09:23 PDT 2017


blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/12930fc0453ac019e3f9a9cde50699914f7ba1d0

commit 12930fc0453ac019e3f9a9cde50699914f7ba1d0
Author: John Crispin <john at phrozen.org>
AuthorDate: Thu Aug 31 21:09:05 2017 +0200

    Revert "dropbear: Link ssh and scp command to /bin instead of /usr/bin"
    
    This reverts commit f7528ed0a8586434e18e9007b1bf0d05a18d6418.
    
    Signed-off-by: John Crispin <john at phrozen.org>
---
 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 95852ba..7302db2 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



More information about the lede-commits mailing list