X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5f3470d6fe9de1b23a5332fd051d729330695726..957731ef89fc1876a0ab8c56d50001011b20abb0:/include/quilt.mk?ds=inline

diff --git a/include/quilt.mk b/include/quilt.mk
index 1bbe9d6ee..925b7a736 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
@@ -100,8 +101,8 @@ define Quilt/RefreshDir
 	mkdir -p $(2)
 	-rm -f $(2)/* 2>/dev/null >/dev/null
 	@( \
-		for patch in $$$$($(if $(3),grep "^$(3)",cat) $(PKG_BUILD_DIR)/patches/series | awk '{print $$$$1}'); do \
-			$(CP) -v "$(PKG_BUILD_DIR)/patches/$$$$patch" $(2); \
+		for patch in $$$$($(if $(3),grep "^$(3)",cat) $(1)/patches/series | awk '{print $$$$1}'); do \
+			$(CP) -v "$(1)/patches/$$$$patch" $(2); \
 		done; \
 	)
 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)"; \