summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-09-10 23:01:45 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-09-10 23:01:45 +0000
commit910f1a953449474833d7ff044a98bbbfa07f8c6d (patch)
treef8976953663aea1f58e945945cac5c0ee1adf6f5
parent947311329f0ea68f411690c04e00ab97c92a6f23 (diff)
fix custom series files in kernel patch directories
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8736 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/quilt.mk4
1 files changed, 2 insertions, 2 deletions
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
(\