X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/3a065a453ff58430b6915b58cf542e81d143ae3e..b15366186d330d7581ececb5401693674d4ec5e6:/include/quilt.mk?ds=sidebyside

diff --git a/include/quilt.mk b/include/quilt.mk
index 3a6f0dc75..c156d3062 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -5,7 +5,10 @@
 # See /LICENSE for more information.
 #
 
-ifeq ($(KERNEL_BUILD),1)
+ifneq ($(__quilt_inc),1)
+__quilt_inc:=1
+
+ifeq ($(TARGET_BUILD),1)
   PKG_BUILD_DIR:=$(LINUX_DIR)
 endif
 PATCH_DIR?=./patches
@@ -15,7 +18,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 +29,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
@@ -42,7 +44,12 @@ ifneq ($(QUILT),)
 else
   define Build/Patch/Default
 	@if [ -d $(PATCH_DIR) -a "$$$$(ls $(PATCH_DIR) | wc -l)" -gt 0 ]; then \
-		$(PATCH) $(PKG_BUILD_DIR) $(PATCH_DIR); \
+		if [ -f $(PATCH_DIR)/series ]; then \
+			grep -vE '^#' $(PATCH_DIR)/series | xargs -n1 \
+				$(PATCH) $(PKG_BUILD_DIR) $(PATCH_DIR); \
+		else \
+			$(PATCH) $(PKG_BUILD_DIR) $(PATCH_DIR); \
+		fi; \
 	fi
   endef
 endif
@@ -59,7 +66,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
 	(\
@@ -135,3 +142,4 @@ refresh: quilt-check
 update: quilt-check
 	$(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
 
+endif