From 7d179076caa8a190bc768317eaec771de111b567 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 4 Oct 2007 15:32:55 +0000 Subject: [PATCH] separate series file fixup from quilt check to avoid series file breakages after fixing a broken patch stack with quilt SVN-Revision: 9120 --- include/quilt.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/quilt.mk b/include/quilt.mk index 667653f320..daeef9431f 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -54,10 +54,11 @@ endef QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y)) ifneq ($(QUILT),) STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched + STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked override CONFIG_AUTOREBUILD= - $(STAMP_CONFIGURED): $(STAMP_PATCHED) FORCE + $(STAMP_CONFIGURED): $(STAMP_CHECKED) FORCE prepare: $(STAMP_PATCHED) - quilt-check: $(STAMP_PATCHED) + quilt-check: $(STAMP_CHECKED) endif define Build/Patch/Default @@ -119,6 +120,9 @@ $(STAMP_PATCHED): $(STAMP_PREPARED) 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 push -a); fi touch $@ -- 2.30.2