From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 22 Feb 2009 17:50:31 +0000 (+0000)
Subject: eliminate redundancy by creating the quilt_used stampfile in the right place
X-Git-Tag: reboot~24402
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bc6fcb0067e2af16337cd3144c4c5ab532f09ac0;p=oweals%2Fopenwrt.git

eliminate redundancy by creating the quilt_used stampfile in the right place

SVN-Revision: 14620
---

diff --git a/include/host-build.mk b/include/host-build.mk
index fdba1b36cb..3f714cd682 100644
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -27,7 +27,6 @@ ifneq ($(strip $(HOST_UNPACK)),)
   define Host/Prepare/Default
   	$(HOST_UNPACK)
 	$(Host/Patch)
-	$(if $(QUILT),touch $(HOST_BUILD_DIR)/.quilt_used)
   endef
 endif
 
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index e0cb6e8995..3f3273f44d 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -39,7 +39,6 @@ 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 4323c77b2b..77b76a6dae 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -79,11 +79,13 @@ endif
 define Host/Patch/Default
 	$(if $(QUILT),rm -rf $(HOST_BUILD_DIR)/patches; mkdir -p $(HOST_BUILD_DIR)/patches)
 	$(call PatchDir,$(HOST_BUILD_DIR),$(PATCH_DIR),)
+	$(if $(QUILT),touch $(HOST_BUILD_DIR)/.quilt_used)
 endef
 
 define Build/Patch/Default
 	$(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
 	$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR),)
+	$(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
 endef
 
 kernel_files=$(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.)
diff --git a/package/libertas/Makefile b/package/libertas/Makefile
index 1641abeeb6..66a90c80e9 100644
--- a/package/libertas/Makefile
+++ b/package/libertas/Makefile
@@ -35,7 +35,6 @@ define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
 	$(Build/Patch)
-	$(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
 endef
 
 define Build/Compile
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 5573648c5c..fc71e92431 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -410,7 +410,6 @@ define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 	$(PKG_UNPACK)
 	$(Build/Patch)
-	$(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
 	unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT61FW)
 	unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT71FW)
 	-unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT2860FW)