From: nbd Date: Wed, 21 Jul 2010 16:06:20 +0000 (+0000) Subject: merge the kernel config cleanup that was added to trunk as part of r20837 X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=331e9cd0f5f1ce5ea5d832256f6c21e9322100e8;p=10.03%2Fopenwrt.git merge the kernel config cleanup that was added to trunk as part of r20837 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22330 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 300139cab..0969b844a 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -97,9 +97,8 @@ define Kernel/Configure/2.6 endef define Kernel/Configure/Default $(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target - echo "$(if $(CONFIG_KERNEL_KALLSYMS),CONFIG_KALLSYMS=y,# CONFIG_KALLSYMS is not set)" >> $(LINUX_DIR)/.config.target - echo "$(if $(CONFIG_KERNEL_PROFILING),CONFIG_PROFILING=y,# CONFIG_PROFILING is not set)" >> $(LINUX_DIR)/.config.target - echo "$(if $(CONFIG_KERNEL_DEBUG_FS),CONFIG_DEBUG_FS=y,# CONFIG_DEBUG_FS is not set)" >> $(LINUX_DIR)/.config.target +# copy CONFIG_KERNEL_* settings over to .config.target + awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target