cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14257 from zhanhb/alternatives-libexec

Browse Source 
treewide: move binaries of alternatives to /usr/libexec
This commit is contained in:
Rosen Penev
2020-12-17 21:41:04 -08:00
committed by GitHub
parent b2ba75c1c1 fc02216ab2
commit c12f6762ef
7 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/bridge-utils/Makefile
+3 -3
View File
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=bridge-utils
PKG_VERSION:=1.7
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/shemminger/bridge-utils
@@ -31,7 +31,7 @@ define Package/bridge
CATEGORY:=Base system
TITLE:=Ethernet bridging configuration utility
URL:=http://www.linuxfromscratch.org/blfs/view/svn/basicnet/bridge-utils.html
ALTERNATIVES:=300:/usr/sbin/brctl:/usr/libexec/bridge-utils-brctl
ALTERNATIVES:=300:/usr/sbin/brctl:/usr/libexec/brctl-bridge-utils
endef
define Package/bridge/description
@@ -44,7 +44,7 @@ CONFIGURE_ARGS += \
define Package/bridge/install
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/brctl $(1)/usr/libexec/bridge-utils-brctl
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/brctl $(1)/usr/libexec/brctl-bridge-utils
endef
$(eval $(call BuildPackage,bridge))
net/openssh/Makefile
+6 -7
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssh
PKG_VERSION:=8.4p1
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -49,9 +49,8 @@ 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 \
200:/usr/bin/ssh:/usr/libexec/ssh-openssh \
200:/usr/bin/scp:/usr/libexec/scp-openssh
endef
define Package/openssh-client/description
@@ -197,9 +196,9 @@ define Package/openssh-client/install
$(INSTALL_DIR) $(1)/etc/ssh
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/openssh-ssh
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/bin/openssh-scp
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh $(1)/usr/libexec/ssh-openssh
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/scp $(1)/usr/libexec/scp-openssh
endef
define Package/openssh-client-utils/install
net/wget/Makefile
+7 -7
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=wget
PKG_VERSION:=1.20.3
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
@@ -47,7 +47,7 @@ $(call Package/wget/Default)
TITLE+= (with SSL support)
VARIANT:=ssl
PROVIDES+=wget-ssl
ALTERNATIVES:=300:/usr/bin/wget:/usr/bin/wget-ssl
ALTERNATIVES:=300:/usr/bin/wget:/usr/libexec/wget-ssl
endef
define Package/wget/description
@@ -60,7 +60,7 @@ $(call Package/wget/Default)
TITLE+= (without SSL support)
VARIANT:=nossl
PROVIDES+=wget
ALTERNATIVES:=300:/usr/bin/wget:/usr/bin/wget-nossl
ALTERNATIVES:=300:/usr/bin/wget:/usr/libexec/wget-nossl
endef
define Package/wget-nossl/description
@@ -95,13 +95,13 @@ ifeq ($(BUILD_VARIANT),nossl)
endif
define Package/wget/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/bin/wget-ssl
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/libexec/wget-ssl
endef
define Package/wget-nossl/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/bin/wget-nossl
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wget $(1)/usr/libexec/wget-nossl
endef
$(eval $(call BuildPackage,wget))