X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=include%2Fkernel-build.mk;h=75c2bcf01aacbedcd5699638c5836db28c9037b3;hp=3b767c382bba22458e94d1087313ff5a214eb09d;hb=83b31e078f713ebc761f90030d71e12618bd68ad;hpb=244de87d189b2608677c7a39c50e0722c6445a8c diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 3b767c382..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) @@ -78,6 +78,7 @@ define BuildKernel oldconfig menuconfig: $(STAMP_PREPARED) FORCE $(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) $(Kernel/Configure) @@ -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