fix make kernel_menuconfig for subtarget kernel config files

[openwrt.git] / include / kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 75c2bcf..089753e 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -77,27 +77,21 @@ define BuildKernel
        $(MAKE) -C image compile TARGET_BUILD=
 
   oldconfig menuconfig: $(STAMP_PREPARED) FORCE
        $(MAKE) -C image compile TARGET_BUILD=
 
   oldconfig menuconfig: $(STAMP_PREPARED) FORCE

+       [ -e "$(LINUX_CONFIG)" ] || touch "$(LINUX_CONFIG)"

        $(LINUX_CONFCMD) > $(LINUX_DIR)/.config
        touch $(LINUX_CONFIG)
        $(LINUX_CONFCMD) > $(LINUX_DIR)/.config
        touch $(LINUX_CONFIG)

-       $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
-       $(SCRIPT_DIR)/kconfig.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(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))

        $(Kernel/Configure)
 
   install: $(LINUX_DIR)/.image
        $(Kernel/Configure)
 
   install: $(LINUX_DIR)/.image

-       TARGET_BUILD="" $(MAKE) -C image compile install
+       +$(MAKE) -C image compile install TARGET_BUILD=

 
   clean: FORCE
        rm -rf $(KERNEL_BUILD_DIR)
 
 
   clean: FORCE
        rm -rf $(KERNEL_BUILD_DIR)
 

-  rebuild: FORCE
-       @$(MAKE) mostlyclean
-       @if [ -f $(LINUX_KERNEL) ]; then \
-               $(MAKE) clean; \
-       fi
-       @$(MAKE) compile
-

   image-prereq:
   image-prereq:

-       @$(NO_TRACE_MAKE) -s -C image prereq TARGET_BUILD=
+       @+$(NO_TRACE_MAKE) -s -C image prereq TARGET_BUILD=

 
   prereq: image-prereq
 
 
   prereq: image-prereq