qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 22:53:09 +02:00
Code

package/kernel fixes:

Browse Source 
- 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
This commit is contained in:
nico 2008-05-08 11:16:07 +00:00
parent 937b6c47c1
commit 008871c4e6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/kernel/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -17,8 +17,6 @@ SCAN_DEPS=modules/*.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
ifeq ($(DUMP),) ifeq ($(DUMP),)
-include $(LINUX_DIR)/.config -include $(LINUX_DIR)/.config
NF_KMOD:=1
include $(INCLUDE_DIR)/netfilter.mk
endif endif
define Build/Prepare define Build/Prepare

3
package/kernel/modules/netfilter.mk
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -7,6 +7,7 @@
# $Id$ # $Id$
NF_MENU:=Netfilter Extensions NF_MENU:=Netfilter Extensions
NF_KMOD:=1
include $(INCLUDE_DIR)/netfilter.mk include $(INCLUDE_DIR)/netfilter.mk
define KernelPackage/ipt-conntrack define KernelPackage/ipt-conntrack