X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=include%2Fkernel-build.mk;h=75c2bcf01aacbedcd5699638c5836db28c9037b3;hp=65907600c983584b275e717df49e7bb092b2bdc3;hb=83b31e078f713ebc761f90030d71e12618bd68ad;hpb=6db7ad74f61eeaae0c8ecb08d483599d9d80c53f

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 65907600c..75c2bcf01 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -7,16 +7,13 @@
 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
+include $(INCLUDE_DIR)/download.mk
 include $(INCLUDE_DIR)/quilt.mk
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
@@ -40,12 +37,15 @@ define Kernel/Clean
 	$(call Kernel/Clean/Default)
 endef
 
+define Download/kernel
+  URL:=$(LINUX_SITE)
+  FILE:=$(LINUX_SOURCE)
+  MD5SUM:=$(LINUX_KERNEL_MD5SUM)
+endef
+
 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)
@@ -77,10 +77,11 @@ define BuildKernel
 	$(MAKE) -C image compile TARGET_BUILD=
 
   oldconfig menuconfig: $(STAMP_PREPARED) FORCE
-	$(Kernel/Configure)
 	$(LINUX_CONFCMD) > $(LINUX_DIR)/.config
-	$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $@
+	touch $(LINUX_CONFIG)
+	$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
 	$(SCRIPT_DIR)/kconfig.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
+	$(Kernel/Configure)
 
   install: $(LINUX_DIR)/.image
 	TARGET_BUILD="" $(MAKE) -C image compile install
@@ -96,7 +97,7 @@ define BuildKernel
 	@$(MAKE) compile
 
   image-prereq:
-	$(SUBMAKE) -s -C image prereq TARGET_BUILD=
+	@$(NO_TRACE_MAKE) -s -C image prereq TARGET_BUILD=
 
   prereq: image-prereq