summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-09-10 23:01:45 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-09-10 23:01:45 +0000
commit749cefa063ccd964e939037ba1fd093c80263e7c (patch)
tree5c94adea84693ee2aecf36adda97e99e223d4c3b
parent9dc06a4c2e8cd2f41ba28f9b3b6d916c5318ed4b (diff)
downloadmtk-20170518-749cefa063ccd964e939037ba1fd093c80263e7c.zip
mtk-20170518-749cefa063ccd964e939037ba1fd093c80263e7c.tar.gz
mtk-20170518-749cefa063ccd964e939037ba1fd093c80263e7c.tar.bz2
fix custom series files in kernel patch directories
SVN-Revision: 8736
-rw-r--r--include/quilt.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/quilt.mk b/include/quilt.mk
index c0a868f..a2cbdf9 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
(\