cosmetic fix for iproute2 config

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 1a0c385..ffaef00 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -1,9 +1,12 @@
+# $Id$
+

 include $(TOPDIR)/rules.mk
 include kernelconfig.mk
 
 PKG_NAME := iptables
 include $(TOPDIR)/rules.mk
 include kernelconfig.mk
 
 PKG_NAME := iptables

-PKG_VERSION := 1.2.11
+PKG_VERSION := 1.3.0

 PKG_RELEASE := 1
 PKG_RELEASE := 1

+PKG_MD5SUM := a072c0f09f1b289cb7af56f76407d033

 
 PKG_SOURCE_SITE := http://www.netfilter.org/files
 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 PKG_SOURCE_SITE := http://www.netfilter.org/files
 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2


@@ -28,9 +31,17 @@ ifneq ($(BR2_PACKAGE_IP6TABLES),)
 TARGETS += $(PKG_IP6T)
 endif
 
 TARGETS += $(PKG_IP6T)
 endif
 

+INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/iptables.list
+ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-extra.list
+endif
+ifeq ($(BR2_PACKAGE_IP6TABLES),y)
+INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip6tables.list
+endif
+

 $(DL_DIR)/$(PKG_SOURCE_FILE):
        mkdir -p $(DL_DIR)
 $(DL_DIR)/$(PKG_SOURCE_FILE):
        mkdir -p $(DL_DIR)

-       $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)

 
 $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
        mkdir -p $(PKG_BUILD_DIR)/modules
 
 $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
        mkdir -p $(PKG_BUILD_DIR)/modules


@@ -53,11 +64,12 @@ $(PKG_IPT): $(PKG_BUILD_DIR)/iptables
        (cd $(PKG_BUILD_DIR)/extensions; \
         cp $(patsubst %,libipt_%.so,$(ext-y)) $(I_IPT)/usr/lib/iptables)
        -$(STRIP) $(I_IPT)/usr/lib/iptables/*.so
        (cd $(PKG_BUILD_DIR)/extensions; \
         cp $(patsubst %,libipt_%.so,$(ext-y)) $(I_IPT)/usr/lib/iptables)
        -$(STRIP) $(I_IPT)/usr/lib/iptables/*.so

-       mkdir -p $(I_IPT_EXTRA)/$(MODULES_SUBDIR)
-       cp $(MODULES_DIR)/kernel/net/ipv6/netfilter/*.o $(I_IPT_EXTRA)/$(MODULES_SUBDIR)

        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR)
 
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR)
 

+$(IPKG_STATE_DIR)/info/iptables.list: $(PKG_IPT)
+       $(IPKG) install $(PKG_IPT)
+

 $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
        mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables
 $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
        mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables


@@ -67,6 +79,9 @@ $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR)
 
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR)
 

+$(IPKG_STATE_DIR)/info/iptables-extra.list: $(PKG_IPT)
+       $(IPKG) install $(PKG_IPT_EXTRA)
+

 $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
        mkdir -p $(I_IP6T)/usr/sbin
 $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
        mkdir -p $(I_IP6T)/usr/sbin


@@ -79,19 +94,15 @@ $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR)
 
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR)
 

+$(IPKG_STATE_DIR)/info/ip6tables.list: $(PKG_IP6T)
+       $(IPKG) install $(PKG_IP6T)
+

 
 source: $(DL_DIR)/$(PKG_SOURCE_FILE)
 prepare: $(PKG_BUILD_DIR)/.patched
 compile: $(TARGETS)
 
 source: $(DL_DIR)/$(PKG_SOURCE_FILE)
 prepare: $(PKG_BUILD_DIR)/.patched
 compile: $(TARGETS)

-install: compile
-       $(IPKG) install $(PKG_IPT)
-ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y)
-       $(IPKG) install $(PKG_IPT_EXTRA)
-endif
-ifeq ($(BR2_PACKAGE_IP6TABLES),y)
-       $(IPKG) install $(PKG_IP6T)
-endif
+install: $(INSTALL_TARGETS)

 
 clean:
        rm -rf $(PKG_BUILD_DIR)
 
 clean:
        rm -rf $(PKG_BUILD_DIR)

-       rm -f $(PKG_IPT) 
+       rm -f $(PKG_IPT) $(PKG_IPT_EXTRA) $(PKG_IP6T)