Signed-off-by: Cody P Schafer <de...@codyps.com>
---
include/quilt.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/quilt.mk b/include/quilt.mk
index 925b7a7..e256489 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -22,7 +22,7 @@ endif
QUILT_CMD:=quilt --quiltrc=-
define filter_series
-sed -e s,\\\#.*,, $(1) | grep -E \[a-zA-Z0-9\]
+sed -e s,\\\#.*,, $(1) | grep -E \[a-zA-Z0-9\] | grep -v '^.*~$$$$'
endef
define PatchDir/Quilt
@@ -31,7 +31,7 @@ define PatchDir/Quilt
mkdir -p "$(1)/patches/$(3)"; \
cp "$(2)/series" "$(1)/patches/$(3)"; \
fi
- @for patch in $$$$( (cd "$(2)" && if [ -f series ]; then $(call
filter_series,series); else ls | sort; fi; ) 2>/dev/null ); do ( \
+ @for patch in $$$$( (cd "$(2)" && if [ -f series ]; then $(call
filter_series,series); else ls | sort | grep -v '^.*~$$$$'; fi; ) 2>/dev/null
); do ( \
cp "$(2)/$$$$patch" "$(1)/patches/$(3)"; \
echo "$(3)$$$$patch" >> "$(1)/patches/series"; \
); done
--
1.8.4.2
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
