X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fquilt.mk;h=a9af2268bc2273b8b12665e3248a4fd59edba55b;hb=a4c0645326f05e9e69e6422f0d76f2141aea16b3;hp=f5b852c3ce44e835a7f4f55882b08348efb52a90;hpb=24dee6de525b4575abaf589f921f044937fdb0d2;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/include/quilt.mk b/include/quilt.mk
index f5b852c3ce..a9af2268bc 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
@@ -67,7 +68,7 @@ ifneq ($(PKG_BUILD_DIR),)
 endif
 
 ifneq ($(HOST_BUILD_DIR),)
-  HOST_QUILT?=$(if $(findstring command,$(origin $(QUILT))),$(QUILT),$(if $(wildcard $(HOST_BUILD_DIR)/.quilt_used),y))
+  HOST_QUILT?=$(if $(findstring command,$(origin QUILT)),$(QUILT),$(if $(wildcard $(HOST_BUILD_DIR)/.quilt_used),y))
   ifneq ($(HOST_QUILT),)
     HOST_STAMP_CHECKED:=$(HOST_BUILD_DIR)/.quilt_checked
     override CONFIG_AUTOREBUILD=
@@ -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