diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-04-02 16:25:51 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-04-02 16:25:51 +0000 |
| commit | a54b6055a8e4a71e0a487497fa642c65e7820ee9 (patch) | |
| tree | 0a412e6d8ff1e451440c5db4d49dcf5eedea7c0f /package/iproute2 | |
| parent | 5f332bf12cf7b1d68d16e404094e5da8a0fe2765 (diff) | |
| download | upstream-a54b6055a8e4a71e0a487497fa642c65e7820ee9.tar.gz upstream-a54b6055a8e4a71e0a487497fa642c65e7820ee9.tar.bz2 upstream-a54b6055a8e4a71e0a487497fa642c65e7820ee9.zip | |
iproute2: update to 3.2.0 and package 'ss'
This patch bumps iproute2 to the latest available version, fixes the
package URL to use kernel.org (as things have now been moved back there)
and also adds ss (socket statistics) to menuconfig.
Signed-off-by: Oliver Smith <olipro@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>
SVN-Revision: 31179
Diffstat (limited to 'package/iproute2')
| -rw-r--r-- | package/iproute2/Makefile | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 38e493a6af..3b442583ed 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=2.6.39 +PKG_VERSION:=3.2.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://devresources.linux-foundation.org/dev/iproute2/download/ -PKG_MD5SUM:=8a3b6bc77c2ecf752284aa4a6fc630a6 +PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ +PKG_MD5SUM:=d58f388b670e0c1b2cd81eb65d5ac626 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) @@ -29,6 +29,7 @@ endef define Package/ip $(call Package/iproute2/Default) SUBMENU:=Routing and Redirection + DEPENDS:= +libnl-tiny TITLE:=Routing control utility endef @@ -47,21 +48,23 @@ $(call Package/iproute2/Default) TITLE:=General netlink utility frontend endef +define Package/ss +$(call Package/iproute2/Default) + TITLE:=Socket statistics utility +endef + define Build/Configure $(SED) "s,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile $(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \ $(PKG_BUILD_DIR)/Makefile $(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \ $(PKG_BUILD_DIR)/Makefile - # For now disable compiling of the misc directory because it seems to fail - rm -rf $(PKG_BUILD_DIR)/misc - $(SED) "s, misc,," $(PKG_BUILD_DIR)/Makefile echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \ > $(PKG_BUILD_DIR)/include/SNAPSHOT.h endef MAKE_FLAGS += \ - EXTRA_CCOPTS="$(TARGET_CFLAGS)" \ + EXTRA_CCOPTS="$(TARGET_CFLAGS) -I../include -I$(STAGING_DIR)/usr/include/libnl-tiny" \ KERNEL_INCLUDE="$(LINUX_DIR)/include" \ FPIC="$(FPIC)" @@ -73,6 +76,7 @@ define Build/Compile $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) all $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/tc $(MAKE_FLAGS) tc $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/ip $(MAKE_FLAGS) ip + $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/misc $(MAKE_FLAGS) ss endef define Build/InstallDev @@ -99,6 +103,12 @@ define Package/genl/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/genl/genl $(1)/usr/sbin/ endef +define Package/ss/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/ss $(1)/usr/sbin/ +endef + $(eval $(call BuildPackage,ip)) $(eval $(call BuildPackage,tc)) $(eval $(call BuildPackage,genl)) +$(eval $(call BuildPackage,ss)) |