X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=include%2Fquilt.mk;h=3377eb105533fbbcf16144d121613ce59d42d680;hp=6c4839ba4ac324efc5f226e03c9bf548c6fb8572;hb=19ac39e650f4d0a2506d5841babd9978940ce2c8;hpb=d0ddef4be10182314022f491a18d9cde0807a625 diff --git a/include/quilt.mk b/include/quilt.mk index 6c4839ba4a..3377eb1055 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. @@ -39,12 +39,13 @@ 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 \ - $(PATCH) "$(1)" "$(2)"; \ + $(KPATCH) "$(1)" "$(2)"; \ else \ - $(PATCH) "$(1)" "$(2)"; \ + $(KPATCH) "$(1)" "$(2)"; \ fi; \ fi endef @@ -124,7 +125,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)"; \