[package] 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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31179 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
7f11e0b7b6
commit
7b2cc3d636
|
@ -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))
|
||||
|
|
Loading…
Reference in New Issue