diff options
| author | Mike Baker <mbm@openwrt.org> | 2004-09-19 07:46:50 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2004-09-19 07:46:50 +0000 |
| commit | 315a2bb36178b50dbbaf54e7710135401d1cb8eb (patch) | |
| tree | dc912af70a48e5982f34df06cc89a58aed637fb7 /obsolete-buildroot | |
| parent | a99e1515704d85c3f66272c2f4bd7649ccfec591 (diff) | |
| download | upstream-315a2bb36178b50dbbaf54e7710135401d1cb8eb.tar.gz upstream-315a2bb36178b50dbbaf54e7710135401d1cb8eb.tar.bz2 upstream-315a2bb36178b50dbbaf54e7710135401d1cb8eb.zip | |
moved netfilter patches to avoid conflicts with patch-o-matic
SVN-Revision: 165
Diffstat (limited to 'obsolete-buildroot')
| -rw-r--r-- | obsolete-buildroot/make/netfilter.mk | 3 | ||||
| -rw-r--r-- | obsolete-buildroot/make/openwrt.mk | 2 |
2 files changed, 3 insertions, 2 deletions
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 |