X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fquilt.mk;h=2e7941eaed3f9e7a20c53107271fde6cce74a8b7;hb=a97e529e3fb77b1200ef53d30b3e4af696588171;hp=5fbdda1b9f8057b713b2ff8a3b0904a9b78c1842;hpb=5e3aec3af3b2531112c46268b90f17c4df358efb;p=openwrt-10.03%2F.git

diff --git a/include/quilt.mk b/include/quilt.mk
index 5fbdda1b9..2e7941eae 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -5,52 +5,109 @@
 # See /LICENSE for more information.
 #
 
+ifeq ($(KERNEL_BUILD),1)
+  PKG_BUILD_DIR:=$(LINUX_DIR)
+endif
+PATCH_DIR?=./patches
+
+define Quilt/Patch
+	@for patch in $$$$( (cd $(1) && ls) 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
+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 cd ./patches; ls)
+  override CONFIG_AUTOREBUILD=
   define Build/Patch/Default
 	rm -rf $(PKG_BUILD_DIR)/patches
 	mkdir -p $(PKG_BUILD_DIR)/patches
-	@for patch in $(PATCHES); do ( \
-		cp "./patches/$$$$patch" $(PKG_BUILD_DIR); \
-		cd $(PKG_BUILD_DIR); \
-		quilt import -p 1 "$$$$patch"; \
-		quilt push -f >/dev/null 2>/dev/null; \
-		rm -f "$$$$patch"; \
-	); done
+	$(call Quilt/Patch,$(PATCH_DIR),)
 	@echo
 	touch $(PKG_BUILD_DIR)/.quilt_used
   endef
-  $(STAMP_CONFIGURED): $(STAMP_PATCHED)
+  $(STAMP_CONFIGURED): $(STAMP_PATCHED) FORCE
   prepare: $(STAMP_PATCHED)
+  quilt-check: $(STAMP_PATCHED)
 else
   define Build/Patch/Default
-	@if [ -d ./patches -a "$$$$(ls ./patches | wc -l)" -gt 0 ]; then \
-		$(PATCH) $(PKG_BUILD_DIR) ./patches; \
+	@if [ -d $(PATCH_DIR) -a "$$$$(ls $(PATCH_DIR) | wc -l)" -gt 0 ]; then \
+		$(PATCH) $(PKG_BUILD_DIR) $(PATCH_DIR); \
 	fi
   endef
 endif
 
+define Kernel/Patch/Default
+	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_PATCH_DIR),generic/), \
+		if [ -d $(GENERIC_PATCH_DIR) ]; then $(PATCH) $(LINUX_DIR) $(GENERIC_PATCH_DIR); fi \
+	)
+	$(if $(strip $(QUILT)),$(call Quilt/Patch,$(PATCH_DIR),platform/), \
+		if [ -d $(PATCH_DIR) ]; then $(PATCH) $(LINUX_DIR) $(PATCH_DIR); fi \
+	)
+	$(if $(strip $(QUILT)),touch $(PKG_BUILD_DIR)/.quilt_used)
+endef
+
 $(STAMP_PATCHED): $(STAMP_PREPARED)
 	@cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true
-	cd $(PKG_BUILD_DIR); quilt push -a
+	(\
+		cd $(PKG_BUILD_DIR)/patches; \
+		find * -type f \! -name series | sort > series; \
+	)
+	[ -f "$(PKG_BUILD_DIR)/patches/series" ] && cd $(PKG_BUILD_DIR); quilt push -a
 	touch $@
 
-refresh: $(STAMP_PREPARED)
+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); \
+		done; \
+	)
+endef
+
+define Quilt/Refresh/Package
+	$(call Quilt/RefreshDir,$(PATCH_DIR))
+endef
+
+define Quilt/Refresh/Kernel
+	@[ -z "$$(grep -v '^generic/' $(PKG_BUILD_DIR)/patches/series | grep -v '^platform/')" ] || { \
+		echo "All kernel patches must start with either generic/ or platform/"; \
+		false; \
+	}
+	$(call Quilt/RefreshDir,$(GENERIC_PATCH_DIR),generic/)
+	$(call Quilt/RefreshDir,$(PATCH_DIR),platform/)
+endef
+
+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; \
+	}
 	@[ -f "$(PKG_BUILD_DIR)/patches/series" ] || { \
-		echo "The source directory was not unpacked using quilt. Please rebuild."; \
+		echo "The source directory contains no quilt patches."; \
 		false; \
 	}
 	@[ "$$(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; \
 	}
-	rm -f ./patches/* 2>/dev/null >/dev/null
-	@( \
-		for patch in $$(cat $(PKG_BUILD_DIR)/patches/series); do \
-			$(CP) -v "$(PKG_BUILD_DIR)/patches/$$patch" ./patches; \
-		done; \
-	)
+
+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
+	$(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
+	
+update: quilt-check
+	$(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
+