Add missing .configured target that caused superfluous package rebuild

[openwrt.git] / obsolete-buildroot / make / iptables.mk

diff --git a/obsolete-buildroot/make/iptables.mk b/obsolete-buildroot/make/iptables.mk
index 886e542..8139e5a 100644 (file)
--- a/obsolete-buildroot/make/iptables.mk
+++ b/obsolete-buildroot/make/iptables.mk
@@ -4,8 +4,10 @@
 #
 #############################################################
 IPTABLES_SOURCE_URL=http://www.netfilter.org/files
 #
 #############################################################
 IPTABLES_SOURCE_URL=http://www.netfilter.org/files

-IPTABLES_SOURCE=iptables-1.2.9.tar.bz2
-IPTABLES_BUILD_DIR=$(BUILD_DIR)/iptables-1.2.9
+IPTABLES_SOURCE=iptables-1.2.11.tar.bz2
+IPTABLES_BUILD_DIR=$(BUILD_DIR)/iptables-1.2.11
+IP6TABLES_IPK=$(BUILD_DIR)/ip6tables_1.2.11-1_mipsel.ipk
+IP6TABLES_IPK_DIR:=$(BUILD_DIR)/ip6tables-1.2.11-ipk

 
 $(DL_DIR)/$(IPTABLES_SOURCE):
         $(WGET) -P $(DL_DIR) $(IPTABLES_SOURCE_URL)/$(IPTABLES_SOURCE) 
 
 $(DL_DIR)/$(IPTABLES_SOURCE):
         $(WGET) -P $(DL_DIR) $(IPTABLES_SOURCE_URL)/$(IPTABLES_SOURCE) 


@@ -19,7 +21,7 @@ $(IPTABLES_BUILD_DIR)/.configured: $(IPTABLES_BUILD_DIR)/.unpacked
        $(SOURCE_DIR)/patch-kernel.sh $(IPTABLES_BUILD_DIR) $(SOURCE_DIR) iptables-*.patch
        #
        $(SED) "s;\[ -f /usr/include/netinet/ip6.h \];grep -q '__UCLIBC_HAS_IPV6__ 1' \
        $(SOURCE_DIR)/patch-kernel.sh $(IPTABLES_BUILD_DIR) $(SOURCE_DIR) iptables-*.patch
        #
        $(SED) "s;\[ -f /usr/include/netinet/ip6.h \];grep -q '__UCLIBC_HAS_IPV6__ 1' \

-               $(BUILD_DIR)/uClibc/include/bits/uClibc_config.h;" $(IPTABLES_BUILD_DIR)/Makefile
+               $(BUILD_DIR)/uClibc-0.9.27/include/bits/uClibc_config.h;" $(IPTABLES_BUILD_DIR)/Makefile

        touch  $(IPTABLES_BUILD_DIR)/.configured
 
 $(IPTABLES_BUILD_DIR)/iptables: $(IPTABLES_BUILD_DIR)/.configured
        touch  $(IPTABLES_BUILD_DIR)/.configured
 
 $(IPTABLES_BUILD_DIR)/iptables: $(IPTABLES_BUILD_DIR)/.configured


@@ -35,11 +37,25 @@ $(TARGET_DIR)/sbin/iptables: $(IPTABLES_BUILD_DIR)/iptables
                CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
                DESTDIR=$(TARGET_DIR) install
        $(STRIP) $(TARGET_DIR)/usr/sbin/iptables*
                CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
                DESTDIR=$(TARGET_DIR) install
        $(STRIP) $(TARGET_DIR)/usr/sbin/iptables*

+       $(STRIP) $(TARGET_DIR)/usr/sbin/ip6tables*

        $(STRIP) $(TARGET_DIR)/usr/lib/iptables/*.so
        rm -rf $(TARGET_DIR)/usr/man
 
 iptables: $(TARGET_DIR)/sbin/iptables 
 
        $(STRIP) $(TARGET_DIR)/usr/lib/iptables/*.so
        rm -rf $(TARGET_DIR)/usr/man
 
 iptables: $(TARGET_DIR)/sbin/iptables 
 

+$(IP6TABLES_IPK):
+       mkdir -p $(IP6TABLES_IPK_DIR)/CONTROL
+       mkdir -p $(IP6TABLES_IPK_DIR)/usr/lib/iptables
+       mkdir -p $(IP6TABLES_IPK_DIR)/usr/sbin
+       install -m 644 $(OPENWRT_IPK_DIR)/ip6tables/ip6tables.control $(IP6TABLES_IPK_DIR)/CONTROL/control
+       install -m 755 $(IPTABLES_BUILD_DIR)/ip6tables $(IP6TABLES_IPK_DIR)/usr/sbin
+       install -m 755 $(IPTABLES_BUILD_DIR)/extensions/libip6t_*.so $(IP6TABLES_IPK_DIR)/usr/lib/iptables/
+       $(STRIP) $(IP6TABLES_IPK_DIR)/usr/sbin/ip6tables*
+       $(STRIP) $(IP6TABLES_IPK_DIR)/usr/lib/iptables/*.so
+       cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(IP6TABLES_IPK_DIR)
+
+ip6tables-ipk: iptables $(IP6TABLES_IPK)
+

 iptables-source: $(DL_DIR)/$(IPTABLES_SOURCE)
 
 iptables-clean:
 iptables-source: $(DL_DIR)/$(IPTABLES_SOURCE)
 
 iptables-clean: