add retry setting to atftp

[openwrt.git] / openwrt / package / iproute2 / Makefile

diff --git a/openwrt/package/iproute2/Makefile b/openwrt/package/iproute2/Makefile
index ba8d80e..f829293 100644 (file)
--- a/openwrt/package/iproute2/Makefile
+++ b/openwrt/package/iproute2/Makefile
@@ -3,19 +3,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2

-PKG_VERSION:=2.6.9
+PKG_VERSION:=2.6.15-060110

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=4b3f335b0139cb909c6a2ae8bf72e548
+PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5

 
 PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
 
 PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/

-PKG_SOURCE:=$(PKG_NAME)-2.6.9-041019.tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-2.6.9
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION)

 PKG_CAT:=zcat
 
 include $(TOPDIR)/package/rules.mk
 
 PKG_CAT:=zcat
 
 include $(TOPDIR)/package/rules.mk
 

-$(eval $(call PKG_template,IPROUTE2_IP,ip,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,IPROUTE2_TC,tc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,IP,ip,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,TC,tc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 
 $(PKG_BUILD_DIR)/.configured:
        $(SED) "s:-O2:${TARGET_CFLAGS}:g" $(PKG_BUILD_DIR)/Makefile
 
 $(PKG_BUILD_DIR)/.configured:
        $(SED) "s:-O2:${TARGET_CFLAGS}:g" $(PKG_BUILD_DIR)/Makefile


@@ -30,18 +30,19 @@ $(PKG_BUILD_DIR)/.configured:
        touch $@
 
 $(PKG_BUILD_DIR)/.built:
        touch $@
 
 $(PKG_BUILD_DIR)/.built:

+       $(MAKE) -j1 -C $(PKG_BUILD_DIR)/netem HOSTCC=$(HOSTCC) CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -I ../include -DRESOLVE_HOSTNAMES"

        $(MAKE) -j1 -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip
        touch $@
 
        $(MAKE) -j1 -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip
        touch $@
 

-$(IPKG_IPROUTE2_IP):
-       mkdir -p $(IDIR_IPROUTE2_IP)/usr/sbin
-       cp $(PKG_BUILD_DIR)/ip/ip $(IDIR_IPROUTE2_IP)/usr/sbin/
-       $(STRIP) $(IDIR_IPROUTE2_IP)/usr/sbin/*
-       $(IPKG_BUILD) $(IDIR_IPROUTE2_IP) $(PACKAGE_DIR)
-
-$(IPKG_IPROUTE2_TC):
-       mkdir -p $(IDIR_IPROUTE2_TC)/usr/sbin
-       cp $(PKG_BUILD_DIR)/tc/tc $(IDIR_IPROUTE2_TC)/usr/sbin/
-       $(STRIP) $(IDIR_IPROUTE2_TC)/usr/sbin/*
-       $(IPKG_BUILD) $(IDIR_IPROUTE2_TC) $(PACKAGE_DIR)
+$(IPKG_IP):
+       mkdir -p $(IDIR_IP)/usr/sbin
+       $(CP) $(PKG_BUILD_DIR)/ip/ip $(IDIR_IP)/usr/sbin/
+       $(STRIP) $(IDIR_IP)/usr/sbin/*
+       $(IPKG_BUILD) $(IDIR_IP) $(PACKAGE_DIR)
+
+$(IPKG_TC):
+       mkdir -p $(IDIR_TC)/usr/sbin
+       $(CP) $(PKG_BUILD_DIR)/tc/tc $(IDIR_TC)/usr/sbin/
+       $(STRIP) $(IDIR_TC)/usr/sbin/*
+       $(IPKG_BUILD) $(IDIR_TC) $(PACKAGE_DIR)