NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

infra/pkg-download: make the URI list a callable macro

Browse Source 
Currently, that variable is context-dependent, as it expects the PKG
variable to exist and be defined to the current package.

This is not so clean, so change the variable to a callable macro.

Adapt the caller accordingly.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Yann E. MORIN 2019-04-15 21:47:24 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 813b94e6be
commit 06426e16c8
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package/pkg-download.mk
View File

@ -63,19 +63,19 @@ github = https://github.com/$(1)/$(2)/archive/$(3)
export BR_NO_CHECK_HASH_FOR = export BR_NO_CHECK_HASH_FOR =
################################################################################ ################################################################################
# DOWNLOAD -- Download helper. Will call DL_WRAPPER which will try to download # DOWNLOAD_URIS - List the candidates URIs where to get the package from:
# source from:
# 1) BR2_PRIMARY_SITE if enabled # 1) BR2_PRIMARY_SITE if enabled
# 2) Download site, unless BR2_PRIMARY_SITE_ONLY is set # 2) Download site, unless BR2_PRIMARY_SITE_ONLY is set
# 3) BR2_BACKUP_SITE if enabled, unless BR2_PRIMARY_SITE_ONLY is set # 3) BR2_BACKUP_SITE if enabled, unless BR2_PRIMARY_SITE_ONLY is set
# #
# Argument 1 is the source location # Argument 1 is the source location
# Argument 2 is the upper-case package name
# #
################################################################################ ################################################################################
ifneq ($(call qstrip,$(BR2_PRIMARY_SITE)),) ifneq ($(call qstrip,$(BR2_PRIMARY_SITE)),)
DOWNLOAD_URIS += \ DOWNLOAD_URIS += \
$(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)/$($(2)_DL_SUBDIR)),urlencode) \
$(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)),urlencode) $(call getschemeplusuri,$(call qstrip,$(BR2_PRIMARY_SITE)),urlencode)
endif endif
@ -84,11 +84,19 @@ DOWNLOAD_URIS += \
$(patsubst %/,%,$(dir $(call qstrip,$(1)))) $(patsubst %/,%,$(dir $(call qstrip,$(1))))
ifneq ($(call qstrip,$(BR2_BACKUP_SITE)),) ifneq ($(call qstrip,$(BR2_BACKUP_SITE)),)
DOWNLOAD_URIS += \ DOWNLOAD_URIS += \
$(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \ $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(2)_DL_SUBDIR)),urlencode) \
$(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)),urlencode) $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)),urlencode)
endif endif
endif endif
################################################################################
# DOWNLOAD -- Download helper. Will call DL_WRAPPER which will try to download
# source from the list returned by DOWNLOAD_URIS.
#
# Argument 1 is the source location
#
################################################################################
define DOWNLOAD define DOWNLOAD
$(Q)mkdir -p $($(PKG)_DL_DIR) $(Q)mkdir -p $($(PKG)_DL_DIR)
$(Q)$(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ $(Q)$(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \
@ -101,7 +109,7 @@ define DOWNLOAD
-N '$($(PKG)_RAWNAME)' \ -N '$($(PKG)_RAWNAME)' \
-o '$($(PKG)_DL_DIR)/$(notdir $(1))' \ -o '$($(PKG)_DL_DIR)/$(notdir $(1))' \
$(if $($(PKG)_GIT_SUBMODULES),-r) \ $(if $($(PKG)_GIT_SUBMODULES),-r) \
$(foreach uri,$(DOWNLOAD_URIS),-u $(uri)) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(PKG)),-u $(uri)) \
$(QUIET) \ $(QUIET) \
-- \ -- \
$($(PKG)_DL_OPTS) $($(PKG)_DL_OPTS)