X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fquilt.mk;h=b18b6364fe27b3aff1d58c35eede55f38cdc676d;hp=9309fc94b76f27719d239d07f7187b7daa84b4f9;hb=f7fb6e49f214e8a38698bab4d33551addbc04439;hpb=d3f412f4ec3a6e47297ab22c60208394aed9b03c diff --git a/include/quilt.mk b/include/quilt.mk index 9309fc94b7..b18b6364fe 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -17,6 +17,7 @@ HOST_FILES_DIR?=$(FILES_DIR) ifeq ($(MAKECMDGOALS),refresh) override QUILT=1 + override HOST_QUILT=1 endif QUILT_CMD:=quilt --quiltrc=- @@ -39,7 +40,8 @@ define PatchDir/Quilt endef define PatchDir/Default - @if [ -d "$(2)" -a "$$$$(ls $(2) | wc -l)" -gt 0 ]; then \ + @if [ -d "$(2)" ] && [ "$$$$(ls $(2) | wc -l)" -gt 0 ]; then \ + export PATCH="$(PATCH)"; \ if [ -s "$(2)/series" ]; then \ $(call filter_series,$(2)/series) | xargs -n1 \ $(KPATCH) "$(1)" "$(2)"; \ @@ -124,7 +126,8 @@ define Quilt/Refresh/Kernel endef define Quilt/Template - $($(2)STAMP_CONFIGURED): $($(2)STAMP_CHECKED) FORCE + $($(2)STAMP_CONFIGURED): $($(2)STAMP_CHECKED) + $(if $(NO_RECONFIGURE),$($(2)STAMP_BUILT),$($(2)STAMP_CONFIGURED)): FORCE $($(2)STAMP_CHECKED): $($(2)STAMP_PREPARED) if [ -s "$(1)/patches/series" ]; then \ (cd "$(1)"; \