diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-10-04 15:32:55 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-10-04 15:32:55 +0000 |
| commit | 7d179076caa8a190bc768317eaec771de111b567 (patch) | |
| tree | 07e35b9780f4a3f0c4d44012eba6053dcf7273d7 /include | |
| parent | bc2dcb8be48ba149269d8fe5e4641de8137016f4 (diff) | |
| download | upstream-7d179076caa8a190bc768317eaec771de111b567.tar.gz upstream-7d179076caa8a190bc768317eaec771de111b567.tar.bz2 upstream-7d179076caa8a190bc768317eaec771de111b567.zip | |
separate series file fixup from quilt check to avoid series file breakages after fixing a broken patch stack with quilt
SVN-Revision: 9120
Diffstat (limited to 'include')
| -rw-r--r-- | include/quilt.mk | 8 |
1 files 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 $@ |