0028-download.mk-fix-packed-checkout-mirroring-support.patch 977 B

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