From 8e4255397198574a9cd1354e194cb65bdd2051c0 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 18 Jul 2007 11:31:01 +0000 Subject: dynamically enable/disable kernel config options for kmod packages based on build system config SVN-Revision: 8026 --- include/kernel-defaults.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/kernel-defaults.mk') 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 -- cgit v1.2.3