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 | 9a724ec84e675b6a625efa3eb9b1d906759c4aeb (patch) | |
tree | 07dee3c07ba60a709824992f98610da5357fd0f7 /include/kernel-defaults.mk | |
parent | a228d3f366975e263d3acb7ab6596dbf0fb1f73b (diff) | |
download | upstream-9a724ec84e675b6a625efa3eb9b1d906759c4aeb.tar.gz upstream-9a724ec84e675b6a625efa3eb9b1d906759c4aeb.tar.bz2 upstream-9a724ec84e675b6a625efa3eb9b1d906759c4aeb.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)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18362 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include/kernel-defaults.mk')
-rw-r--r-- | include/kernel-defaults.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 35627f7bc4..f49cbb93a0 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -105,7 +105,7 @@ define Kernel/Configure/Default $(SED) 's,.*CONFIG_AEABI.*,$(if $(CONFIG_EABI_SUPPORT),CONFIG_AEABI=y,# CONFIG_AEABI is not set),' $(LINUX_DIR)/.config.target $(if $(CONFIG_EABI_SUPPORT),echo '# CONFIG_OABI_COMPAT is not set' >> $(LINUX_DIR)/.config.target) $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override - $(SCRIPT_DIR)/kconfig.pl 'm+' $(LINUX_DIR)/.config.target $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config + $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config $(call Kernel/SetInitramfs) $(call Kernel/Configure/$(KERNEL)) rm -rf $(KERNEL_BUILD_DIR)/modules |