fix #2112

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

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 83d0d5e..96fb7fa 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -15,8 +15,13 @@ GENERIC_LINUX_CONFIG:=$(GENERIC_PLATFORM_DIR)/config-$(shell [ -f "$(GENERIC_PLA
 LINUX_CONFIG_DIR ?= ./config$(shell [ -d "./config-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
 LINUX_CONFIG ?= $(LINUX_CONFIG_DIR)/default
 
 LINUX_CONFIG_DIR ?= ./config$(shell [ -d "./config-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
 LINUX_CONFIG ?= $(LINUX_CONFIG_DIR)/default
 

--include $(GENERIC_LINUX_CONFIG)
--include $(LINUX_CONFIG)
+ifneq ($(DUMP),)
+  TMP_CONFIG:=$(TMP_DIR)/.kconfig-$(BOARD)-$(KERNEL)
+  $(TMP_CONFIG): $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG)
+       $(SCRIPT_DIR)/config.pl + $^ > $@
+  -include $(TMP_CONFIG)
+  .SILENT: $(TMP_CONFIG)
+endif

 
 ifneq ($(CONFIG_ATM),)
   FEATURES += atm
 
 ifneq ($(CONFIG_ATM),)
   FEATURES += atm


@@ -93,15 +98,15 @@ define BuildKernel
        $(call Kernel/Prepare)
        touch $$@
 
        $(call Kernel/Prepare)
        touch $$@
 

-  $(STAMP_CONFIGURED): $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG) $(TOPDIR)/.config

        $(call Kernel/Configure)
        touch $$@
 
        $(call Kernel/Configure)
        touch $$@
 

-  $(LINUX_DIR)/.modules: $(LINUX_DIR)/.configured $(LINUX_DIR)/.config FORCE
+  $(LINUX_DIR)/.modules: $(STAMP_CONFIGURED) $(LINUX_DIR)/.config FORCE

        $(call Kernel/CompileModules)
        touch $$@
 
        $(call Kernel/CompileModules)
        touch $$@
 

-  $(LINUX_DIR)/.image: $(LINUX_DIR)/.configured FORCE
+  $(LINUX_DIR)/.image: $(STAMP_CONFIGURED) FORCE

        $(call Kernel/CompileImage)
        touch $$@
        
        $(call Kernel/CompileImage)
        touch $$@
        


@@ -164,12 +169,12 @@ endef
 $(eval $(call shexport,Target/Description))
 
 download: $(DL_DIR)/$(LINUX_SOURCE)
 $(eval $(call shexport,Target/Description))
 
 download: $(DL_DIR)/$(LINUX_SOURCE)

-prepare: $(LINUX_DIR)/.configured
+prepare: $(STAMP_CONFIGURED)

 compile: $(LINUX_DIR)/.modules
 compile: $(LINUX_DIR)/.modules

-menuconfig: $(LINUX_DIR)/.prepared FORCE
+oldconfig menuconfig: $(STAMP_PREPARED) FORCE

        $(call Kernel/Configure)
        $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG) > $(LINUX_DIR)/.config
        $(call Kernel/Configure)
        $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG) > $(LINUX_DIR)/.config

-       $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) menuconfig
+       $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $@

        $(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
 
 install: $(LINUX_DIR)/.image
        $(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
 
 install: $(LINUX_DIR)/.image