From 80d2beea9d2661d7bd6a97efda4957af2638619d Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 4 Jun 2007 11:14:08 +0000 Subject: Rename 'refresh' to 'update' and make the new 'refresh' actually refresh all the patches. Also added a target package/refresh which will do this to all packages in the buildroot git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7488 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/quilt.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'include/quilt.mk') diff --git a/include/quilt.mk b/include/quilt.mk index e8c3b90a68..53fb0a262b 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -34,6 +34,7 @@ ifneq ($(QUILT),) endef $(STAMP_CONFIGURED): $(STAMP_PATCHED) 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)) -- cgit v1.2.3