fresh diffs for linux-mips (26.3 cvs) and ebtables (15.3)

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

diff --git a/openwrt/package/iproute2/Makefile b/openwrt/package/iproute2/Makefile
index a2d52df..e442129 100644 (file)
--- a/openwrt/package/iproute2/Makefile
+++ b/openwrt/package/iproute2/Makefile
@@ -1,13 +1,12 @@
-#############################################################
-#
-# ebtables
-#
-#############################################################
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2
 PKG_VERSION:=2.6.9
 PKG_RELEASE:=1
+PKG_MD5SUM:=4b3f335b0139cb909c6a2ae8bf72e548
+
 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
@@ -20,7 +19,7 @@ PKG_TC:=$(PACKAGE_DIR)/tc_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 PKG_TC_DIR:=$(PKG_BUILD_DIR)/ipkg/tc
 
 $(DL_DIR)/$(PKG_SOURCE):
-        $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE)
+        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
 $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE)
        $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
@@ -53,6 +52,9 @@ $(PKG_IP): $(PKG_BUILD_DIR)/ip/ip $(PACKAGE_DIR)
        $(STRIP) $(PKG_IP_DIR)/usr/sbin/*
        $(IPKG_BUILD) $(PKG_IP_DIR) $(PACKAGE_DIR)
 
+$(IPKG_STATE_DIR)/info/ip.list: $(PKG_IP)
+       $(IPKG) install $(PKG_IP)
+
 $(PKG_TC): $(PKG_BUILD_DIR)/tc/tc $(PACKAGE_DIR)
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_TC_DIR) tc.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
        mkdir -p $(PKG_TC_DIR)/usr/sbin
@@ -60,6 +62,9 @@ $(PKG_TC): $(PKG_BUILD_DIR)/tc/tc $(PACKAGE_DIR)
        $(STRIP) $(PKG_TC_DIR)/usr/sbin/*
        $(IPKG_BUILD) $(PKG_TC_DIR) $(PACKAGE_DIR)
 
+$(IPKG_STATE_DIR)/info/tc.list: $(PKG_TC)
+       $(IPKG) install $(PKG_TC)
+
 $(PACKAGE_DIR):
        mkdir -p $(PACKAGE_DIR)
 
@@ -71,17 +76,18 @@ ifneq ($(BR2_PACKAGE_IPROUTE2_TC),)
 TARGETS += $(PKG_TC)
 endif
 
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(TARGETS)
-install:
 ifeq ($(BR2_PACKAGE_IPROUTE2_IP),y)
-       $(IPKG) install $(PKG_IP)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip.list
 endif
 ifeq ($(BR2_PACKAGE_IPROUTE2_TC),y)
-       $(IPKG) install $(PKG_TC)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/tc.list
 endif
 
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.patched
+compile: $(TARGETS)
+install: $(INSTALL_TARGETS)
 
 clean:
        rm -rf $(PKG_BUILD_DIR)
+       rm -f $(PKG_IP) $(PKG_TC)