From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 10 Sep 2007 23:01:45 +0000 (+0000)
Subject: fix custom series files in kernel patch directories
X-Git-Tag: reboot~28161
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=749cefa063ccd964e939037ba1fd093c80263e7c;p=oweals%2Fopenwrt.git

fix custom series files in kernel patch directories

SVN-Revision: 8736
---

diff --git a/include/quilt.mk b/include/quilt.mk
index c0a868fbf9..a2cbdf9eeb 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -15,7 +15,7 @@ ifeq ($(MAKECMDGOALS),refresh)
 endif
 
 define Quilt/Patch
-	@for patch in $$$$( (cd $(1) && ls) 2>/dev/null ); do ( \
+	@for patch in $$$$( (cd $(1) && if [ -f series ]; then grep -v '^#' series; else ls; fi; ) 2>/dev/null ); do ( \
 		cp "$(1)/$$$$patch" $(PKG_BUILD_DIR); \
 		cd $(PKG_BUILD_DIR); \
 		quilt import -P$(2)$$$$patch -p 1 "$$$$patch"; \
@@ -59,7 +59,7 @@ define Kernel/Patch/Default
 	$(if $(strip $(QUILT)),touch $(PKG_BUILD_DIR)/.quilt_used)
 endef
 
-ifeq ($(KERNEL_BUILD),1)
+ifeq ($(TARGET_BUILD),1)
 $(STAMP_PATCHED): $(STAMP_PREPARED)
 	@cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true
 	(\