X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fkernel-build.mk;h=b6d2cf5efbb6ee27274d8cb42b15f8b75516a1e7;hb=ad91de86f521b239a749b9ab5de7d2eb45e9fd8b;hp=3b767c382bba22458e94d1087313ff5a214eb09d;hpb=244de87d189b2608677c7a39c50e0722c6445a8c;p=openwrt.git diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 3b767c382b..b6d2cf5efb 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -8,15 +8,12 @@ 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,7 +77,9 @@ define BuildKernel $(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) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@ $(SCRIPT_DIR)/kconfig.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG) $(Kernel/Configure) @@ -96,7 +98,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