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>
This commit is contained in:
parent
6908c82a88
commit
ea55e13236
|
@ -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) \
|
||||
|
|
|
@ -488,7 +488,8 @@ BR_NO_CHECK_HASH_FOR += $$($(2)_SOURCE)
|
|||
endif
|
||||
|
||||
$(2)_ALL_DOWNLOADS = \
|
||||
$$(foreach p,$$($(2)_SOURCE) $$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS),\
|
||||
$$($(2)_SITE_METHOD)+$$($(2)_SITE)/$$($(2)_SOURCE) \
|
||||
$$(foreach p,$$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS),\
|
||||
$$(if $$(findstring ://,$$(p)),$$(p),\
|
||||
$$($(2)_SITE)/$$(p)))
|
||||
|
||||
|
|
Loading…
Reference in a new issue