X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fquilt.mk;h=925b7a736bd83710331c4396b804d8593505e58f;hp=6c4839ba4ac324efc5f226e03c9bf548c6fb8572;hb=97fc11af79f76c467abf512c55bd88b288d87b38;hpb=9d8f81149f3fd173e01e252c94da3fde7e95aee0

diff --git a/include/quilt.mk b/include/quilt.mk
index 6c4839ba4a..925b7a736b 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -39,12 +39,13 @@ define PatchDir/Quilt
 endef
 
 define PatchDir/Default
-	@if [ -d "$(2)" -a "$$$$(ls $(2) | wc -l)" -gt 0 ]; then \
+	@if [ -d "$(2)" ] && [ "$$$$(ls $(2) | wc -l)" -gt 0 ]; then \
+		export PATCH="$(PATCH)"; \
 		if [ -s "$(2)/series" ]; then \
 			$(call filter_series,$(2)/series) | xargs -n1 \
-				$(PATCH) "$(1)" "$(2)"; \
+				$(KPATCH) "$(1)" "$(2)"; \
 		else \
-			$(PATCH) "$(1)" "$(2)"; \
+			$(KPATCH) "$(1)" "$(2)"; \
 		fi; \
 	fi
 endef
@@ -124,7 +125,8 @@ define Quilt/Refresh/Kernel
 endef
 
 define Quilt/Template
-  $($(2)STAMP_CONFIGURED): $($(2)STAMP_CHECKED) FORCE
+  $($(2)STAMP_CONFIGURED): $($(2)STAMP_CHECKED)
+  $(if $(NO_RECONFIGURE),$($(2)STAMP_BUILT),$($(2)STAMP_CONFIGURED)): FORCE
   $($(2)STAMP_CHECKED): $($(2)STAMP_PREPARED)
 	if [ -s "$(1)/patches/series" ]; then \
 		(cd "$(1)"; \