ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-18 21:28:02 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

separate series file fixup from quilt check to avoid series file breakages after fixing a broken patch stack with quilt

Browse Source 
SVN-Revision: 9120
This commit is contained in:
Felix Fietkau 2007-10-04 15:32:55 +00:00
parent bc2dcb8be4
commit 7d179076ca
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/quilt.mk
View File

@ -54,10 +54,11 @@ endef
QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y)) QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y))
ifneq ($(QUILT),) ifneq ($(QUILT),)
STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked
override CONFIG_AUTOREBUILD= override CONFIG_AUTOREBUILD=
$(STAMP_CONFIGURED): $(STAMP_PATCHED) FORCE $(STAMP_CONFIGURED): $(STAMP_CHECKED) FORCE
prepare: $(STAMP_PATCHED) prepare: $(STAMP_PATCHED)
quilt-check: $(STAMP_PATCHED) quilt-check: $(STAMP_CHECKED)
endif endif
define Build/Patch/Default define Build/Patch/Default
@ -119,6 +120,9 @@ $(STAMP_PATCHED): $(STAMP_PREPARED)
find * -type f \! -name series | sort > series; \ find * -type f \! -name series | sort > series; \
fi; \ fi; \
) )
touch $@
$(STAMP_CHECKED): $(STAMP_PATCHED)
if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt push -a); fi if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt push -a); fi
touch $@ touch $@