From: Mike Baker <mbm@openwrt.org>
Date: Sun, 19 Sep 2004 07:46:50 +0000 (+0000)
Subject: moved netfilter patches to avoid conflicts with patch-o-matic
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=315a2bb36178b50dbbaf54e7710135401d1cb8eb;p=librecmc%2Flibrecmc.git

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

SVN-Revision: 165
---

diff --git a/obsolete-buildroot/make/netfilter.mk b/obsolete-buildroot/make/netfilter.mk
index 801f74af6b..dd69b2cc6a 100644
--- 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
 
-$(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
 
diff --git a/obsolete-buildroot/make/openwrt.mk b/obsolete-buildroot/make/openwrt.mk
index fbf1cffb81..6b77c2c56d 100644
--- 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
 
-$(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