27 lines
977 B
Diff
27 lines
977 B
Diff
|
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||
|
|
Date: Sun, 24 Apr 2016 08:49:27 +0200
|
||
|
|
Subject: download.mk: fix packed checkout mirroring support
|
||
|
|
|
||
|
|
Changeset r48416 broke the downloading of mirrored, packed scm checkouts.
|
||
|
|
|
||
|
|
Fix this by removing the "@" sign in front of the download command which is
|
||
|
|
now executed as part of a larger shell command under flock.
|
||
|
|
|
||
|
|
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
|
||
|
|
|
||
|
|
Backport of r48733
|
||
|
|
|
||
|
|
diff --git a/include/download.mk b/include/download.mk
|
||
|
|
index 9176b11..130bbc5 100644
|
||
|
|
--- a/include/download.mk
|
||
|
|
+++ b/include/download.mk
|
||
|
|
@@ -48,7 +48,7 @@ define DownloadMethod/default
|
||
|
|
endef
|
||
|
|
|
||
|
|
define wrap_mirror
|
||
|
|
- $(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" "" || ( $(1) ),$(1))
|
||
|
|
+$(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" "" || ( $(1) ),$(1))
|
||
|
|
endef
|
||
|
|
|
||
|
|
define DownloadMethod/cvs
|