X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7fa4d1679256b06f168bfa5cd1c313a131b53c5e..51c76d8aa5224233370fa5de9cc1277f5a797a66:/package/iproute2/Makefile diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 7cbc903da..b8f386ecf 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -1,20 +1,19 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=2.6.23 -PKG_RELEASE:=1 +PKG_VERSION:=2.6.31 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/ -PKG_MD5SUM:=2e59da739ef19990408cf0a5cb0cae3e +PKG_SOURCE_URL:=http://devresources.linux-foundation.org/dev/iproute2/download/ +PKG_MD5SUM:=230f35282a95451622f3e8394f9cd80a PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) @@ -34,6 +33,7 @@ endef define Package/tc $(call Package/iproute2/Default) TITLE:=Traffic control utility + DEPENDS:=+kmod-sched endef define Package/genl @@ -42,24 +42,38 @@ $(call Package/iproute2/Default) endef define Build/Configure - $(SED) "s:-O2:${TARGET_CFLAGS}:g" $(PKG_BUILD_DIR)/Makefile $(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 + rm -rf $(PKG_BUILD_DIR)/misc $(SED) "s, misc,," $(PKG_BUILD_DIR)/Makefile endef +MAKE_FLAGS += \ + EXTRA_CCOPTS="$(TARGET_CFLAGS)" \ + KERNEL_INCLUDE="$(LINUX_DIR)/include" \ + FPIC="$(FPIC)" \ + all tc/tc ip/ip + define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/netem HOSTCC="$(HOSTCC)" CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -I ../include -DRESOLVE_HOSTNAMES" - $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip + $(_SINGLE)$(MAKE) -C $(PKG_BUILD_DIR)/netem HOSTCC="$(HOSTCC)" EXTRA_CCOPTS="$(TARGET_CFLAGS)" CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -I ../include -DRESOLVE_HOSTNAMES" + $(_SINGLE)$(Build/Compile/Default) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/include/libnetlink.h $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/libnetlink.a $(1)/usr/lib/ endef 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 @@ -76,7 +90,3 @@ endef $(eval $(call BuildPackage,ip)) $(eval $(call BuildPackage,tc)) $(eval $(call BuildPackage,genl)) - -$(eval $(call RequireCommand,bison, \ - $(PKG_NAME) requires GNU bison. \ -))