diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-11-11 01:25:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-11-11 01:25:06 +0000 |
| commit | ea41d3a2881e925e4a8cd74b214fb3f836b1e386 (patch) | |
| tree | ef3fa0ff7a3b7b2eecf0aeb41832b3c5645d08da /include/kernel-build.mk | |
| parent | bf2fe7ea9a80e4f72afbdc2466f98aa61a978bf5 (diff) | |
| download | master-31e0f0ae-ea41d3a2881e925e4a8cd74b214fb3f836b1e386.tar.gz master-31e0f0ae-ea41d3a2881e925e4a8cd74b214fb3f836b1e386.tar.bz2 master-31e0f0ae-ea41d3a2881e925e4a8cd74b214fb3f836b1e386.zip | |
merge target kernel config files with subtarget config files and add a variable override for editing the target kernel config file with make kernel_menuconfig in case the subtarget contains overrides (thx, sn9)
SVN-Revision: 18362
Diffstat (limited to 'include/kernel-build.mk')
| -rw-r--r-- | include/kernel-build.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk index e3e446ba58..7c5d1fbe9c 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -104,7 +104,8 @@ define BuildKernel $(LINUX_CONFCMD) > $(LINUX_DIR)/.config touch $(LINUX_CONFIG) $(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@ - $(SCRIPT_DIR)/kconfig.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG)) + $(SCRIPT_DIR)/kconfig.pl '>' $(if $(LINUX_SUBCONFIG),'+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG),$(GENERIC_LINUX_CONFIG)) \ + $(LINUX_DIR)/.config > $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG)) $(Kernel/Configure) install: $(LINUX_DIR)/.image |