moved netfilter patches to avoid conflicts with patch-o-matic

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@165 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/obsolete-buildroot/make/netfilter.mk b/obsolete-buildroot/make/netfilter.mk
index 801f74a..dd69b2c 100644 (file)
--- a/obsolete-buildroot/make/netfilter.mk
+++ b/obsolete-buildroot/make/netfilter.mk
@@ -39,7 +39,8 @@ $(NETFILTER_DIR)/.unpacked: $(DL_DIR)/$(NETFILTER_SOURCE)
        $(SED) "s,\-p1,\-l \-p1," $(NETFILTER_DIR)/runme
        touch $(NETFILTER_DIR)/.unpacked
 
        $(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
 
        -(cd $(NETFILTER_DIR); KERNEL_DIR=$(LINUX_DIR) ./runme --batch $(NETFILTER_EXCLUDE) $(NETFILTER_PATCHES))
        touch $(LINUX_DIR)/.nf-patched
 

diff --git a/obsolete-buildroot/make/openwrt.mk b/obsolete-buildroot/make/openwrt.mk
index fbf1cff..6b77c2c 100644 (file)
--- a/obsolete-buildroot/make/openwrt.mk
+++ b/obsolete-buildroot/make/openwrt.mk
@@ -60,7 +60,7 @@ $(LINUX_DIR)/.patched: $(WRT54G_DIR)/.prepared
        )
        touch $(LINUX_DIR)/.patched
 
        )
        touch $(LINUX_DIR)/.patched
 

-$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched $(LINUX_DIR)/.bbc-patched $(LINUX_DIR)/.nf-patched 
+$(LINUX_DIR)/.configured: $(LINUX_DIR)/.nf-patched $(LINUX_DIR)/.patched $(LINUX_DIR)/.bbc-patched

        $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
        $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/arch/mips/Makefile
        $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
        $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
        $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/arch/mips/Makefile
        $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile