cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-24 21:14:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6344 from yousong/ssh-alt

Browse Source 
openssh: let opkg manage openssh symlinks of ssh, scp
This commit is contained in:
tripolar
2018-06-25 09:13:17 +02:00
committed by GitHub
parent 0421787098 1e07e684a8
commit de8e819f31
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
net/openssh/Makefile
View File

@@ -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