X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fquilt.mk;h=395f64e1747335b648d79ef2a2725524b4105fd8;hb=8ae42e7a4b611d9b368d1b0ddb3b3a02250d73d4;hp=e8c3b90a681d67647fb8794cfed2f02ed3dc4374;hpb=2a63954abc085ab8d6c38a9b70acdeeaec653a75;p=openwrt-10.03%2F.git

diff --git a/include/quilt.mk b/include/quilt.mk
index e8c3b90a6..395f64e17 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -32,8 +32,9 @@ ifneq ($(QUILT),)
 	@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 \
@@ -82,7 +83,7 @@ define Quilt/Refresh/Kernel
 	$(call Quilt/RefreshDir,./patches,platform/)
 endef
 
-refresh: $(STAMP_PREPARED)
+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; \
@@ -95,5 +96,14 @@ refresh: $(STAMP_PREPARED)
 		echo "The patches are not sorted in the right order. Please fix."; \
 		false; \
 	}
+
+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))