diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2018-06-25 13:17:33 +0800 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2018-06-25 14:09:25 +0800 |
| commit | 1e07e684a88915154414b447e215ac781e97b166 (patch) | |
| tree | 2daadb2d25ba4d96ceb6d41e49914d2e08344e7a /net/openssh/Makefile | |
| parent | 04217870981e78f02af01caa929be47131429966 (diff) | |
openssh: let opkg manage openssh symlinks of ssh, scp
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'net/openssh/Makefile')
| -rw-r--r-- | net/openssh/Makefile | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/net/openssh/Makefile b/net/openssh/Makefile index afdd6023e..47f2b6059 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh PKG_VERSION:=7.7p1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ @@ -49,6 +49,10 @@ endef define Package/openssh-client $(call Package/openssh/Default) TITLE+= client + ALTERNATIVES:=\ + 200:/usr/bin/ssh:/usr/bin/openssh-ssh \ + 200:/usr/bin/scp:/usr/bin/openssh-scp \ + endef define Package/openssh-client/description @@ -202,24 +206,6 @@ define Build/Compile all install endef -define Package/openssh-client/preinst -#!/bin/sh -if [ -L $${IPKG_INSTROOT}/usr/bin/ssh ] && [ -L $${IPKG_INSTROOT}/usr/bin/scp ]; then - rm -f $${IPKG_INSTROOT}/usr/bin/ssh $${IPKG_INSTROOT}/usr/bin/scp; -fi -exit 0 -endef - -define Package/openssh-client/postrm -#!/bin/sh -rm -f $${IPKG_INSTROOT}/usr/bin/ssh $${IPKG_INSTROOT}/usr/bin/scp; -if [ -x $${IPKG_INSTROOT}/usr/sbin/dropbear ] ; then - ln -s /usr/sbin/dropbear $${IPKG_INSTROOT}/usr/bin/ssh; - ln -s /usr/sbin/dropbear $${IPKG_INSTROOT}/usr/bin/scp; -fi -exit 0 -endef - define Package/openssh-moduli/install $(INSTALL_DIR) $(1)/etc/ssh $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ssh/moduli $(1)/etc/ssh/ @@ -230,8 +216,8 @@ define Package/openssh-client/install chmod 0700 $(1)/etc/ssh $(CP) $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(1)/etc/ssh/ $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/bin/openssh-ssh + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/bin/openssh-scp endef define Package/openssh-client-utils/install |