X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5f3470d6fe9de1b23a5332fd051d729330695726..1fc276b837d729f8949f73ab972cf34e46ef77fb:/include/quilt.mk diff --git a/include/quilt.mk b/include/quilt.mk index 1bbe9d6ee..9691dc327 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -40,11 +40,12 @@ endef define PatchDir/Default @if [ -d "$(2)" -a "$$$$(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