Author: cyrus Date: 2015-09-08 19:44:17 +0200 (Tue, 08 Sep 2015) New Revision: 46831
Modified: trunk/package/network/utils/iproute2/Makefile Log: iproute2: improve ip-full coexistence, remove rt_table Signed-off-by: Steven Barth <[email protected]> Modified: trunk/package/network/utils/iproute2/Makefile =================================================================== --- trunk/package/network/utils/iproute2/Makefile 2015-09-08 17:44:13 UTC (rev 46830) +++ trunk/package/network/utils/iproute2/Makefile 2015-09-08 17:44:17 UTC (rev 46831) @@ -9,7 +9,7 @@ PKG_NAME:=iproute2 PKG_VERSION:=4.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ @@ -39,10 +39,6 @@ Package/ip-full=$(call Package/iproute2/Default,full,Full) -define Package/ip/conffiles -/etc/iproute2/rt_tables -endef - define Package/ip-$(BUILD_VARIANT)/conffiles $(Package/ip/conffiles) endef @@ -112,13 +108,12 @@ define Package/ip/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_DIR) $(1)/etc/iproute2 - $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/iproute2/rt_tables $(1)/etc/iproute2 $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/ endef -define Package/ip-$(BUILD_VARIANT)/install - $(Package/ip/install) +define Package/ip-full/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/bin/ endef define Package/tc/install _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
