From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 30 Aug 2007 21:11:17 +0000 (+0000)
Subject: allow the kernel to provide own series files for specific subdirs
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9566fb1f0701759d499e1579a340943ff5a7422d;p=openwrt%2Fstaging%2Fansuel.git

allow the kernel to provide own series files for specific subdirs

SVN-Revision: 8557
---

diff --git a/include/quilt.mk b/include/quilt.mk
index dc5a9d2b69..3a6f0dc754 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -59,6 +59,25 @@ define Kernel/Patch/Default
 	$(if $(strip $(QUILT)),touch $(PKG_BUILD_DIR)/.quilt_used)
 endef
 
+ifeq ($(KERNEL_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
 	(\
@@ -67,6 +86,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)