aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-08-15 23:33:37 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-08-15 23:33:37 +0000
commit7feb8409eff3a1d322fd4f3cf7fdbe1c42185195 (patch)
treef8cf8cb5a8d1ff3de97940618ade68ac010ff901
parent7149f627cd1ebb31a045ba8399e3e5bb96dd04a2 (diff)
downloadupstream-7feb8409eff3a1d322fd4f3cf7fdbe1c42185195.tar.gz
upstream-7feb8409eff3a1d322fd4f3cf7fdbe1c42185195.tar.bz2
upstream-7feb8409eff3a1d322fd4f3cf7fdbe1c42185195.zip
always include kernel config for kernel packages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8415 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/kernel.mk3
-rw-r--r--package/kernel/Makefile1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/kernel.mk b/include/kernel.mk
index df859a42b0..5b27d2f459 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -51,6 +51,9 @@ endif
GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL)
GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(shell [ -d "$(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
+ifeq ($(DUMP),)
+ -include $(LINUX_DIR)/.config
+endif
define KernelPackage/Defaults
FILES:=
diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index 3ec07d43ac..b805c6e19d 100644
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -18,7 +18,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