X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/04e9a33b0fb125da5fc97b1c4e16bad733668ece..cec23da75a4f97634d64584d28f83a85b92b2dae:/include/kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 282dc9614..cf8737c8e 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -61,7 +61,7 @@ define BuildKernel
   $(if $(QUILT),$(Build/Quilt))
   $(if $(LINUX_SITE),$(call Download,kernel))
 
-  $(STAMP_PREPARED): $(DL_DIR)/$(LINUX_SOURCE)
+  $(STAMP_PREPARED): $(if $(LINUX_SITE),$(DL_DIR)/$(LINUX_SOURCE))
 	-rm -rf $(KERNEL_BUILD_DIR)
 	-mkdir -p $(KERNEL_BUILD_DIR)
 	$(Kernel/Prepare)
@@ -89,7 +89,7 @@ define BuildKernel
 		echo; \
 	) > $$@
 
-  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG) $(TOPDIR)/.config
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_KCONFIG_LIST) $(TOPDIR)/.config
 	$(Kernel/Configure)
 	touch $$@
 
@@ -114,13 +114,10 @@ define BuildKernel
 	$(MAKE) -C image compile TARGET_BUILD=
 
   oldconfig menuconfig nconfig: $(STAMP_PREPARED) $(STAMP_CHECKED) FORCE
-	[ -e "$(LINUX_CONFIG)" ] || touch "$(LINUX_CONFIG)"
-	$(LINUX_CONFCMD) > $(LINUX_DIR)/.config
-	touch $(LINUX_CONFIG)
+	rm -f $(STAMP_CONFIGURED)
+	$(LINUX_RECONF_CMD) > $(LINUX_DIR)/.config
 	$(_SINGLE)$(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
-	$(SCRIPT_DIR)/kconfig.pl '>' $(if $(LINUX_SUBCONFIG),'+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG),$(GENERIC_LINUX_CONFIG)) \
-		$(LINUX_DIR)/.config > $(if $(LINUX_SUBCONFIG),$(LINUX_SUBCONFIG),$(LINUX_CONFIG))
-	$(Kernel/Configure)
+	$(LINUX_RECONF_DIFF) $(LINUX_DIR)/.config > $(LINUX_RECONFIG_TARGET)
 
   install: $(LINUX_DIR)/.image
 	+$(MAKE) -C image compile install TARGET_BUILD=