X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4e7d27c89015a1ca768e10254b1eb472d3e8021c..b15366186d330d7581ececb5401693674d4ec5e6:/include/quilt.mk

diff --git a/include/quilt.mk b/include/quilt.mk
index 7714f2911..c156d3062 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -5,13 +5,20 @@
 # 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
 
+ifeq ($(MAKECMDGOALS),refresh)
+  override QUILT=1
+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"; \
@@ -22,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
@@ -38,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
@@ -55,6 +66,25 @@ define Kernel/Patch/Default
 	$(if $(strip $(QUILT)),touch $(PKG_BUILD_DIR)/.quilt_used)
 endef
 
+ifeq ($(TARGET_BUILD),1)
+$(STAMP_PATCHED): $(STAMP_PREPARED)
+	@cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true
+	(\
+		cd $(PKG_BUILD_DIR)/patches; \
+		rm -f series; \
+		for file in *; do \
+			if [ -f $$file/series ]; then \
+				echo "Converting $$file/series"; \
+				awk -v file="$$file/" '$$0 !~ /^#/ { print file $$0 }' $$file/series >> series; \
+			else \
+				echo "Sorting patches in $$file"; \
+				find $$file/* -type f \! -name series | sort >> series; \
+			fi; \
+		done; \
+	)
+	if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt push -a); fi
+	touch $@
+else
 $(STAMP_PATCHED): $(STAMP_PREPARED)
 	@cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true
 	(\
@@ -63,6 +93,7 @@ $(STAMP_PATCHED): $(STAMP_PREPARED)
 	)
 	if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt push -a); fi
 	touch $@
+endif
 
 define Quilt/RefreshDir
 	mkdir -p $(1)
@@ -111,3 +142,4 @@ refresh: quilt-check
 update: quilt-check
 	$(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
 
+endif