X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/00ced3071742f70fcf3708770795f055bcfdd05e..f0589f7290ba958bbefaf5394b155d37c72a185e:/package/iproute2/Makefile?ds=sidebyside diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 7354820a0..87585d126 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -1,20 +1,20 @@ -# -# 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.25 -PKG_RELEASE:=1 +PKG_VERSION:=2.6.35 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://devresources.linux-foundation.org/dev/iproute2/download/ -PKG_MD5SUM:=5737bade2f5e03fad0e2c81da91e551e +PKG_MD5SUM:=b0f281b3124bf04669e18f5fe16d4934 +PKG_BUILD_PARALLEL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) @@ -31,9 +31,14 @@ $(call Package/iproute2/Default) TITLE:=Routing control utility endef +define Package/ip/conffiles +/etc/iproute2/rt_tables +endef + define Package/tc $(call Package/iproute2/Default) TITLE:=Traffic control utility + DEPENDS:=+kmod-sched endef define Package/genl @@ -42,20 +47,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 + echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \ + > $(PKG_BUILD_DIR)/include/SNAPSHOT.h endef +MAKE_FLAGS += \ + EXTRA_CCOPTS="$(TARGET_CFLAGS)" \ + KERNEL_INCLUDE="$(LINUX_DIR)/include" \ + FPIC="$(FPIC)" + 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 + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/netem \ + HOSTCC="$(HOSTCC)" EXTRA_CCOPTS="$(TARGET_CFLAGS)" \ + CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall \ + -I../include -DRESOLVE_HOSTNAMES" + $(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 +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 @@ -78,7 +101,3 @@ endef $(eval $(call BuildPackage,ip)) $(eval $(call BuildPackage,tc)) $(eval $(call BuildPackage,genl)) - -$(eval $(call RequireCommand,bison, \ - $(PKG_NAME) requires GNU bison. \ -))