upgrade to squashfs 2.0-r2

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

diff --git a/obsolete-buildroot/make/netfilter.mk b/obsolete-buildroot/make/netfilter.mk
index 114a319..dd69b2c 100644 (file)
--- a/obsolete-buildroot/make/netfilter.mk
+++ b/obsolete-buildroot/make/netfilter.mk
@@ -4,10 +4,12 @@
 #
 #############################################################
 
-NETFILTER_SNAPSHOT:=20040508
-NETFILTER_SOURCE:=patch-o-matic-$(NETFILTER_SNAPSHOT).tar.bz2
-NETFILTER_SITE:=ftp://ftp.netfilter.org/pub/patch-o-matic/snapshot/
-NETFILTER_DIR:=$(BUILD_DIR)/patch-o-matic-$(NETFILTER_SNAPSHOT)
+ifeq ($(strip $(USE_NETFILTER_SNAPSHOT)),)
+USE_NETFILTER_SNAPSHOT=20040508
+endif
+NETFILTER_SOURCE:=patch-o-matic-$(USE_NETFILTER_SNAPSHOT).tar.bz2
+NETFILTER_DIR:=$(BUILD_DIR)/patch-o-matic-$(USE_NETFILTER_SNAPSHOT)
+NETFILTER_SITE:=ftp://ftp.netfilter.org/pub/patch-o-matic/snapshot
 NETFILTER_CAT:=bzcat
 
 # ipv6_mld breaks net/ipv6/mcast.c
@@ -37,7 +39,8 @@ $(NETFILTER_DIR)/.unpacked: $(DL_DIR)/$(NETFILTER_SOURCE)
        $(SED) "s,\-p1,\-l \-p1," $(NETFILTER_DIR)/runme
        touch $(NETFILTER_DIR)/.unpacked
 
-$(LINUX_DIR)/.nf-patched: $(LINUX_DIR)/.patched $(NETFILTER_DIR)/.unpacked
+$(LINUX_DIR)/.nf-patched: $(LINUX_DIR)/.unpacked $(NETFILTER_DIR)/.unpacked
+       $(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR) $(SOURCE_DIR)/openwrt/kernel/netfilter/patches
        -(cd $(NETFILTER_DIR); KERNEL_DIR=$(LINUX_DIR) ./runme --batch $(NETFILTER_EXCLUDE) $(NETFILTER_PATCHES))
        touch $(LINUX_DIR)/.nf-patched