EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iproute2: install ip-tiny and ip-full in /usr/libexec

Browse Source 
Install the ip-tiny and ip-full variants in /usr/libexec as the suffixed
ip variants are not meant to be called directly

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
This commit is contained in:
Hans Dedecker 2018-10-16 14:16:48 +02:00
parent a91d82303c
commit 15a59e3e08
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/network/utils/iproute2/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=iproute2 PKG_NAME:=iproute2
PKG_VERSION:=4.18.0 PKG_VERSION:=4.18.0
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
@ -37,7 +37,7 @@ $(call Package/iproute2/Default)
TITLE:=Routing control utility (Minimal) TITLE:=Routing control utility (Minimal)
VARIANT:=tiny VARIANT:=tiny
PROVIDES:=ip PROVIDES:=ip
ALTERNATIVES:=200:/sbin/ip:/sbin/ip-tiny ALTERNATIVES:=200:/sbin/ip:/usr/libexec/ip-tiny
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
endef endef
@ -46,7 +46,7 @@ $(call Package/iproute2/Default)
TITLE:=Routing control utility (Full) TITLE:=Routing control utility (Full)
VARIANT:=full VARIANT:=full
PROVIDES:=ip PROVIDES:=ip
ALTERNATIVES:=300:/sbin/ip:/sbin/ip-full ALTERNATIVES:=300:/sbin/ip:/usr/libexec/ip-full
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
endef endef
@ -138,13 +138,13 @@ define Build/InstallDev
endef endef
define Package/ip-tiny/install define Package/ip-tiny/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/sbin/ip-tiny $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/libexec/ip-tiny
endef endef
define Package/ip-full/install define Package/ip-full/install
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/sbin/ip-full $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/libexec/ip-full
endef endef
define Package/tc/install define Package/tc/install