X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/221123a954bc0f3be231621a83eceadec0e646bd..4fcbf77ad6679f83bd5663e372962673759541db:/include/quilt.mk

diff --git a/include/quilt.mk b/include/quilt.mk
index e77e0db77..04ebfc349 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -5,71 +5,87 @@
 # 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 filter_series
+sed -e s,\\\#.*,, $(1) | grep -E \[a-zA-Z0-9\]
+endef
 
-define Quilt/Patch
-	@for patch in $$$$( (cd $(1) && ls) 2>/dev/null ); do ( \
+define PatchDir/Quilt
+	@if [ -s $(1)/series ]; then \
+		mkdir -p $(PKG_BUILD_DIR)/patches/$(2); \
+		cp $(1)/series $(PKG_BUILD_DIR)/patches/$(2); \
+	fi
+	@for patch in $$$$( (cd $(1) && if [ -f series ]; then $(call filter_series,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"; \
 		quilt push -f >/dev/null 2>/dev/null; \
 		rm -f "$$$$patch"; \
 	); done
+	$(if $(2),@echo $(2) >> $(PKG_BUILD_DIR)/patches/.subdirs)
+endef
+
+define PatchDir/Default
+	@if [ -d "$(1)" -a "$$$$(ls $(1) | wc -l)" -gt 0 ]; then \
+		if [ -s "$(1)/series" ]; then \
+			$(call filter_series,$(1)/series) | xargs -n1 \
+				$(PATCH) $(PKG_BUILD_DIR) "$(1)"; \
+		else \
+			$(PATCH) $(PKG_BUILD_DIR) "$(1)"; \
+		fi; \
+	fi
+endef
+
+define PatchDir
+$(call PatchDir/$(if $(strip $(QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)))
 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
-  CONFIG_AUTOREBUILD=
-  PATCHES:=$(shell )
-  define Build/Patch/Default
-	rm -rf $(PKG_BUILD_DIR)/patches
-	mkdir -p $(PKG_BUILD_DIR)/patches
-	$(call Quilt/Patch,./patches,)
-	@echo
-	touch $(PKG_BUILD_DIR)/.quilt_used
-  endef
-  $(STAMP_CONFIGURED): $(STAMP_PATCHED)
+  STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked
+  override CONFIG_AUTOREBUILD=
+  $(STAMP_CONFIGURED): $(STAMP_CHECKED) FORCE
   prepare: $(STAMP_PATCHED)
-else
-  define Build/Patch/Default
-	@if [ -d ./patches -a "$$$$(ls ./patches | wc -l)" -gt 0 ]; then \
-		$(PATCH) $(PKG_BUILD_DIR) ./patches; \
-	fi
-  endef
+  quilt-check: $(STAMP_CHECKED)
 endif
 
+define Build/Patch/Default
+	$(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
+	$(call PatchDir,$(PATCH_DIR),)
+endef
+
 define Kernel/Patch/Default
+	$(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
 	if [ -d $(GENERIC_PLATFORM_DIR)/files ]; then $(CP) $(GENERIC_PLATFORM_DIR)/files/* $(LINUX_DIR)/; fi
 	if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi
-	$(if $(strip $(QUILT)),$(call Quilt/Patch,$(GENERIC_PLATFORM_DIR)/patches,generic/), \
-		if [ -d $(GENERIC_PLATFORM_DIR)/patches ]; then $(PATCH) $(LINUX_DIR) $(GENERIC_PLATFORM_DIR)/patches; fi \
-	)
-	$(if $(strip $(QUILT)),$(call Quilt/Patch,./patches,platform/), \
-		if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi \
-	)
+	$(call PatchDir,$(GENERIC_PATCH_DIR),generic/)
+	$(call PatchDir,$(PATCH_DIR),platform/)
 endef
 
-$(STAMP_PATCHED): $(STAMP_PREPARED)
-	@cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true
-	[ -f "$(PKG_BUILD_DIR)/patches/series" ] && cd $(PKG_BUILD_DIR); quilt push -a
-	touch $@
-
 define Quilt/RefreshDir
 	mkdir -p $(1)
 	-rm -f $(1)/* 2>/dev/null >/dev/null
 	@( \
-		for patch in $$($(if $(2),grep "^$(2)",cat) $(PKG_BUILD_DIR)/patches/series | awk '{print $$1}'); do \
-			$(CP) -v "$(PKG_BUILD_DIR)/patches/$$patch" $(1); \
+		for patch in $$$$($(if $(2),grep "^$(2)",cat) $(PKG_BUILD_DIR)/patches/series | awk '{print $$$$1}'); do \
+			$(CP) -v "$(PKG_BUILD_DIR)/patches/$$$$patch" $(1); \
 		done; \
 	)
 endef
 
 define Quilt/Refresh/Package
-	$(call Quilt/RefreshDir,./patches)
+	$(call Quilt/RefreshDir,$(PATCH_DIR))
 endef
 
 define Quilt/Refresh/Kernel
@@ -77,11 +93,41 @@ define Quilt/Refresh/Kernel
 		echo "All kernel patches must start with either generic/ or platform/"; \
 		false; \
 	}
-	$(call Quilt/RefreshDir,$(GENERIC_PLATFORM_DIR)/patches,generic/)
-	$(call Quilt/RefreshDir,./patches,platform/)
+	$(call Quilt/RefreshDir,$(GENERIC_PATCH_DIR),generic/)
+	$(call Quilt/RefreshDir,$(PATCH_DIR),platform/)
+endef
+
+define Quilt/Refresh
+$(if $(TARGET_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
 endef
 
-refresh: $(STAMP_PREPARED)
+$(STAMP_PATCHED): $(STAMP_PREPARED)
+	@( \
+		cd $(PKG_BUILD_DIR)/patches; \
+		quilt pop -a -f >/dev/null 2>/dev/null; \
+		if [ -s ".subdirs" ]; then \
+			rm -f series; \
+			for file in $$(cat .subdirs); do \
+				if [ -f $$file/series ]; then \
+					echo "Converting $$file/series"; \
+					$(call filter_series,$$file/series) | awk -v file="$$file/" '$$0 !~ /^#/ { print file $$0 }' | sed -e s,//,/,g >> series; \
+				else \
+					echo "Sorting patches in $$file"; \
+					find $$file/* -type f \! -name series | sed -e s,//,/,g | sort >> series; \
+				fi; \
+			done; \
+		else \
+			find * -type f \! -name series | sort > series; \
+		fi; \
+	)
+	touch $@
+
+$(STAMP_CHECKED): $(STAMP_PATCHED)
+	if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt next >/dev/null 2>&1 && quilt push -a || quilt top >/dev/null 2>&1); fi
+	touch $@
+
+define Build/Quilt
+  quilt-check: $(STAMP_PREPARED) FORCE
 	@[ -f "$(PKG_BUILD_DIR)/.quilt_used" ] || { \
 		echo "The source directory was not unpacked using quilt. Please rebuild with QUILT=1"; \
 		false; \
@@ -90,9 +136,20 @@ refresh: $(STAMP_PREPARED)
 		echo "The source directory contains no quilt patches."; \
 		false; \
 	}
-	@[ "$$(cat $(PKG_BUILD_DIR)/patches/series | md5sum)" = "$$(sort $(PKG_BUILD_DIR)/patches/series | md5sum)" ] || { \
+	@[ -n "$$$$(ls $(PKG_BUILD_DIR)/patches/series)" -o "$$$$(cat $(PKG_BUILD_DIR)/patches/series | md5sum)" = "$$(sort $(PKG_BUILD_DIR)/patches/series | md5sum)" ] || { \
 		echo "The patches are not sorted in the right order. Please fix."; \
 		false; \
 	}
-	$(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
 
+  refresh: quilt-check
+	@cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null
+	@cd $(PKG_BUILD_DIR); while quilt next 2>/dev/null >/dev/null && quilt push; do \
+		quilt refresh; \
+	done; ! quilt next 2>/dev/null >/dev/null
+	$(Quilt/Refresh)
+	
+  update: quilt-check
+	$(Quilt/Refresh)
+endef
+
+endif