aboutsummaryrefslogtreecommitdiff
path: root/package/pkg-download.mk
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2018-04-25 21:41:53 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-05-01 23:00:16 +0200
commitea55e13236aa7ba76f806785ded2ae28b3dde9e1 (patch)
tree75986611ef43786bb5e202a30ca4b8764896dd0b /package/pkg-download.mk
parent6908c82a8886bd9130e825ccf2d9c58cfa887d23 (diff)
downloadbuildroot-ea55e13236aa7ba76f806785ded2ae28b3dde9e1.tar.gz
buildroot-ea55e13236aa7ba76f806785ded2ae28b3dde9e1.tar.bz2
core/pkg-infra: don't enforce site-method for extra downloads
The site method only ever applies to the main download, while extra downloads are always to be fetched with wget. However, the site method is prepended to the URL from within the DOWNLOAD macro (well, a variable evaluated in the DOWNLOAD macro), which is called for each download of a package, thus effectively prepending the site method to all downloads, even the extra ones (and the patches). We fix that by prepending the site method from within the generic-package infra, so that it only applies to the main download. For that, we move the main _SOURCE out of the foreach loop, so that we can prepend the site-method to it, without impacting the other downloads. Reported-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Luca Ceresoli <luca@lucaceresoli.net> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net> Tested-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/pkg-download.mk')
-rw-r--r--package/pkg-download.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 2d9b0d4a41..2ca6ccf44d 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -82,7 +82,7 @@ endif
ifeq ($(BR2_PRIMARY_SITE_ONLY),)
DOWNLOAD_URIS += \
- -u $($(PKG)_SITE_METHOD)+$(patsubst %/,%,$(dir $(call qstrip,$(1))))
+ -u $(patsubst %/,%,$(dir $(call qstrip,$(1))))
ifneq ($(call qstrip,$(BR2_BACKUP_SITE)),)
DOWNLOAD_URIS += \
-u $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \