From 008871c4e63176a1ca1809217823a43318edb058 Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 8 May 2008 11:16:07 +0000 Subject: package/kernel fixes: - remove dup netfilter.mk includes - always define NF_KMOD so that proper KCONFIG entries are emitted for netfilter modules at DUMP time git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11072 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/Makefile | 4 +--- package/kernel/modules/netfilter.mk | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'package') diff --git a/package/kernel/Makefile b/package/kernel/Makefile index d6364f12f..036af764f 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -17,8 +17,6 @@ SCAN_DEPS=modules/*.mk include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) -include $(LINUX_DIR)/.config - NF_KMOD:=1 - include $(INCLUDE_DIR)/netfilter.mk endif define Build/Prepare diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index 3eeb7aa6a..d6e2a6061 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,6 +7,7 @@ # $Id$ NF_MENU:=Netfilter Extensions +NF_KMOD:=1 include $(INCLUDE_DIR)/netfilter.mk define KernelPackage/ipt-conntrack -- cgit v1.2.3