X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fquilt.mk;h=cd392a7c5dd024ac97c55157900570eb7707be66;hb=f66cb6f810e55016167086bd96310fc14c1e6362;hp=a9af2268bc2273b8b12665e3248a4fd59edba55b;hpb=149341faf161c9144355e1cd75550bd6fe8e37d0;p=openwrt%2Fstaging%2Fwigyori.git diff --git a/include/quilt.mk b/include/quilt.mk index a9af2268bc..cd392a7c5d 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=- @@ -90,7 +91,7 @@ endef kernel_files=$(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.) define Kernel/Patch/Default - rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches + $(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches) $(if $(kernel_files),$(CP) $(kernel_files) $(LINUX_DIR)/) find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f $(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),generic/) @@ -125,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)"; \