X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fnetwork%2Futils%2Fiproute2%2FMakefile;h=5bd3bd89cc70e5577981177bb0d9d8fe457da37b;hb=559635dbb6983b4e95f167d0ac2d3a75af6d3102;hp=2adf844b1f6871e3f5f8d68f538e6e719fe4bca5;hpb=23f774f727a1c1b00294ba0b727889f640b270b8;p=openwrt%2Fstaging%2Fmkresin.git diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 2adf844b1f..5bd3bd89cc 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=4.14.1 -PKG_RELEASE:=1 +PKG_VERSION:=4.19.0 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 -PKG_HASH:=d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067 +PKG_HASH:=d9ec5ca1f47d8a85416fa26e7dc1cbf5d067640eb60e90bdc1c7e5bdc6a29984 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=iptables PKG_LICENSE:=GPL-2.0 @@ -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 @@ -132,19 +132,19 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_BUILD_DIR)/include/{libgenl,libnetlink,ll_map}.h $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/include/{libgenl,libnetlink}.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/lib/libnetlink.a $(1)/usr/lib/ 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