diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-11-11 01:25:06 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-11-11 01:25:06 +0000 |
| commit | ad1ed217dc580c9c3a61248aae80dd05bbb79334 (patch) | |
| tree | 07dee3c07ba60a709824992f98610da5357fd0f7 /include/kernel-build.mk | |
| parent | 7131b95c8c43e07dea4c5491458bb8ab40633357 (diff) | |
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)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18362 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 e3e446ba5..7c5d1fbe9 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 |