From: Hans Dedecker Date: Tue, 16 Oct 2018 12:16:48 +0000 (+0200) Subject: iproute2: install ip-tiny and ip-full in /usr/libexec X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=05ca05b097d178918ddef72f4165927f9f952482;p=openwrt%2Fstaging%2Fjow.git iproute2: install ip-tiny and ip-full in /usr/libexec 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 (backported from 15a59e3e088c693cf7a654c31151149268b9a340) --- diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index ac31310783..791401b1a2 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 PKG_VERSION:=4.18.0 -PKG_RELEASE:=2 +PKG_RELEASE:=2.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 @@ -37,7 +37,7 @@ $(call Package/iproute2/Default) TITLE:=Routing control utility (Minimal) VARIANT:=tiny 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 endef @@ -46,7 +46,7 @@ $(call Package/iproute2/Default) TITLE:=Routing control utility (Full) VARIANT:=full 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 endef @@ -138,13 +138,13 @@ define Build/InstallDev endef define Package/ip-tiny/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/sbin/ip-tiny + $(INSTALL_DIR) $(1)/usr/libexec + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/libexec/ip-tiny endef define Package/ip-full/install - $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/sbin/ip-full + $(INSTALL_DIR) $(1)/usr/libexec + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/libexec/ip-full endef define Package/tc/install