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
commitbeaa7e3c3710546225d0a4e76a6016975f358fcb (patch)
treee5c6efff730f5db1e13935ae29ed1e139b84ff15
parentf3d7b822b3940bf29dce11ee156ea73d98e3f983 (diff)
downloadupstream-beaa7e3c3710546225d0a4e76a6016975f358fcb.tar.gz
upstream-beaa7e3c3710546225d0a4e76a6016975f358fcb.tar.bz2
upstream-beaa7e3c3710546225d0a4e76a6016975f358fcb.zip
allow the kernel to provide own series files for specific subdirs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8557 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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)