aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-08-30 21:11:17 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-08-30 21:11:17 +0000
commit9566fb1f0701759d499e1579a340943ff5a7422d (patch)
tree2a06fab1b28b3c40ce379e60c6b68a9ac01a0d01
parentf0cdd3ffdd3e4af7e90cf0117d09dd8fba68339e (diff)
downloadupstream-9566fb1f0701759d499e1579a340943ff5a7422d.tar.gz
upstream-9566fb1f0701759d499e1579a340943ff5a7422d.tar.bz2
upstream-9566fb1f0701759d499e1579a340943ff5a7422d.zip
allow the kernel to provide own series files for specific subdirs
SVN-Revision: 8557
-rw-r--r--include/quilt.mk20
1 files changed, 20 insertions, 0 deletions
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)