aboutsummaryrefslogtreecommitdiffstats
path: root/include/kernel-defaults.mk
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-07-18 11:31:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-07-18 11:31:01 +0000
commit8e4255397198574a9cd1354e194cb65bdd2051c0 (patch)
treebe8d0a838c6289a68035c8cd154d1ef44cb857bf /include/kernel-defaults.mk
parent00d88f9ffc1484eb8a0761b03c3171ab47d4adbb (diff)
downloadupstream-8e4255397198574a9cd1354e194cb65bdd2051c0.tar.gz
upstream-8e4255397198574a9cd1354e194cb65bdd2051c0.tar.bz2
upstream-8e4255397198574a9cd1354e194cb65bdd2051c0.zip
dynamically enable/disable kernel config options for kmod packages based on build system config
SVN-Revision: 8026
Diffstat (limited to 'include/kernel-defaults.mk')
-rw-r--r--include/kernel-defaults.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 1bd6b427ad..409b7d723a 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -46,11 +46,11 @@ define Kernel/Configure/2.6
-$(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" oldconfig prepare scripts
endef
define Kernel/Configure/Default
- @if [ -f "./config/profile-$(PROFILE)" ]; then \
- $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) '+' $(LINUX_CONFIG) ./config/profile-$(PROFILE) > $(LINUX_DIR)/.config; \
- else \
- $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG) > $(LINUX_DIR)/.config; \
- fi
+ $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) \
+ $(if $(wildcard ./config/profile-$(PROFILE)),'+' $(LINUX_CONFIG) ./config/profile-$(PROFILE), $(LINUX_CONFIG)) \
+ > $(LINUX_DIR)/.config.target
+ $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override
+ $(SCRIPT_DIR)/config.pl 'm+' $(LINUX_DIR)/.config.target $(LINUX_DIR)/.config.override >$(LINUX_DIR)/.config
$(call Kernel/Configure/$(KERNEL))
rm -rf $(KERNEL_BUILD_DIR)/modules
@rm -f $(BUILD_DIR)/linux