2016-04-24 07:11:20 +00:00
|
|
|
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
|
|
|
Date: Sun, 24 Apr 2016 08:48:45 +0200
|
|
|
|
|
Subject: build: add locking for downloads (fixes race conditions with multiple variants)
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
|
|
|
|
|
|
|
|
Backport of r48416
|
|
|
|
|
|
|
|
|
|
diff --git a/include/download.mk b/include/download.mk
|
2016-12-20 00:09:53 +00:00
|
|
|
index e518cce4b2793152b7f4ef92509f2be07fb5cd62..9176b11c836123a37533c3d6cbaa2650a4f7c73d 100644
|
2016-04-24 07:11:20 +00:00
|
|
|
--- a/include/download.mk
|
|
|
|
|
+++ b/include/download.mk
|
|
|
|
|
@@ -182,6 +182,6 @@ define Download
|
|
|
|
|
|
|
|
|
|
$(DL_DIR)/$(FILE):
|
|
|
|
|
mkdir -p $(DL_DIR)
|
|
|
|
|
- $(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/unknown))
|
|
|
|
|
+ $(call locked,$(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/unknown)),$(FILE))
|
|
|
|
|
|
|
|
|
|
endef
|
