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 3b767c3..089753e 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -7,16 +7,13 @@
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/prereq.mk
 
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/prereq.mk
 

-ifneq ($(DUMP),1)
-  override MAKEFLAGS=
-endif
-

 ifneq ($(DUMP),1)
   all: compile
 endif
 
 STAMP_PREPARED:=$(LINUX_DIR)/.prepared
 STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
 ifneq ($(DUMP),1)
   all: compile
 endif
 
 STAMP_PREPARED:=$(LINUX_DIR)/.prepared
 STAMP_CONFIGURED:=$(LINUX_DIR)/.configured

+include $(INCLUDE_DIR)/download.mk

 include $(INCLUDE_DIR)/quilt.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
 include $(INCLUDE_DIR)/quilt.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 


@@ -40,12 +37,15 @@ define Kernel/Clean
        $(call Kernel/Clean/Default)
 endef
 
        $(call Kernel/Clean/Default)
 endef
 

+define Download/kernel
+  URL:=$(LINUX_SITE)
+  FILE:=$(LINUX_SOURCE)
+  MD5SUM:=$(LINUX_KERNEL_MD5SUM)
+endef
+

 define BuildKernel
 define BuildKernel

-  ifneq ($(LINUX_SITE),)
-    $(DL_DIR)/$(LINUX_SOURCE):
-               -mkdir -p $(DL_DIR)
-               $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
-  endif
+  $(if $(QUILT),$(Build/Quilt))
+  $(if $(LINUX_SITE),$(call Download,kernel))

 
   $(STAMP_PREPARED): $(DL_DIR)/$(LINUX_SOURCE)
        -rm -rf $(KERNEL_BUILD_DIR)
 
   $(STAMP_PREPARED): $(DL_DIR)/$(LINUX_SOURCE)
        -rm -rf $(KERNEL_BUILD_DIR)


@@ -77,26 +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
        $(LINUX_CONFCMD) > $(LINUX_DIR)/.config

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

        $(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:

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

 
   prereq: image-prereq
 
 
   prereq: image-prereq