From 8ba85e3dc1750cfe513a724c9f68875725f93934 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 29 Sep 2007 03:39:57 +0000 Subject: [PATCH] move a stampfile to make it easier to override the patch template git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9062 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host-build.mk | 1 + include/kernel-defaults.mk | 1 + include/package-defaults.mk | 1 + include/quilt.mk | 2 -- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/host-build.mk b/include/host-build.mk index c0d62148e..e0a2ec149 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -27,6 +27,7 @@ ifneq ($(strip $(PKG_UNPACK)),) define Build/Prepare/Default $(PKG_UNPACK) $(Build/Patch) + $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used) endef endif diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 7e475660a..fd5bb1ca0 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -45,6 +45,7 @@ Kernel/Patch:=$(Kernel/Patch/Default) define Kernel/Prepare/Default bzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) $(Kernel/Patch) + $(if $(QUILT),touch $(LINUX_DIR)/.quilt_used) endef define Kernel/Configure/2.4 diff --git a/include/package-defaults.mk b/include/package-defaults.mk index c9f8db106..50554b3df 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -39,6 +39,7 @@ ifneq ($(strip $(PKG_UNPACK)),) define Build/Prepare/Default $(PKG_UNPACK) $(Build/Patch) + $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used) endef endif diff --git a/include/quilt.mk b/include/quilt.mk index aa0eda691..8554f19c7 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -59,7 +59,6 @@ endif define Build/Patch/Default $(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches) $(call PatchDir,$(PATCH_DIR),) - $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used) endef define Kernel/Patch/Default @@ -68,7 +67,6 @@ define Kernel/Patch/Default if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi $(call PatchDir,$(GENERIC_PATCH_DIR),generic/) $(call PatchDir,$(PATCH_DIR),platform/) - $(if $(strip $(QUILT)),touch $(PKG_BUILD_DIR)/.quilt_used) endef $(STAMP_PATCHED): $(STAMP_PREPARED) -- 2.20.1