From 3a065a453ff58430b6915b58cf542e81d143ae3e Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 30 Aug 2007 21:11:17 +0000 Subject: [PATCH] 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 --- include/quilt.mk | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/quilt.mk b/include/quilt.mk index dc5a9d2b6..3a6f0dc75 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) -- 2.35.1