X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fquilt.mk;h=a7aac91c06cd230975655ef0869e258c46415d0d;hb=8f3f1755d9495631becd3887e87e35ef7c5c8045;hp=c0a868fbf96692783f69dd6a06c9971e4b56a358;hpb=2ed862c4a542b02c56d0d8525b0299f6c7315b2e;p=openwrt-10.03%2F.git

diff --git a/include/quilt.mk b/include/quilt.mk
index c0a868fbf..a7aac91c0 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"; \
@@ -26,7 +26,6 @@ endef
 
 QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y))
 ifneq ($(QUILT),)
-  STAMP_PREPARED:=$(strip $(STAMP_PREPARED))_q
   STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
   override CONFIG_AUTOREBUILD=
   define Build/Patch/Default
@@ -59,7 +58,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
 	(\