diff mbox

[4/6] package infra: DOWNLOAD is never called with two arguments

Message ID 894fddeb65b5990ef4926605cfe58f1d19804ec8.1389569992.git.yann.morin.1998@free.fr
State Changes Requested
Headers show

Commit Message

Yann E. MORIN Jan. 12, 2014, 11:44 p.m. UTC 
From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Currently, the DOWNLOAD helper accepts one or two arguments:
  - the source URI
  - the source filename, if missing, derived from the URI

But we have no caller of DOWNLOAD that passes a second argument.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/pkg-download.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Arnout Vandecappelle Jan. 14, 2014, 8:51 p.m. UTC | #1 
On 13/01/14 00:44, Yann E. MORIN wrote:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Currently, the DOWNLOAD helper accepts one or two arguments:
>    - the source URI
>    - the source filename, if missing, derived from the URI

  The idea was that it would be possible to download to a different local 
file than what is in the URL, which would e.g. work around the 
<sha1>.tar.gz URLs of gitorious. However, that currently anyway doesn't 
work (because the primary and secondary download sites should use the 
buildroot-filename rather than the url-filename). So I'm OK with removing it.

>
> But we have no caller of DOWNLOAD that passes a second argument.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

  Regards,
  Arnout

> ---
>   package/pkg-download.mk | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> index 8e6f7a3..f3354d1 100644
> --- a/package/pkg-download.mk
> +++ b/package/pkg-download.mk
> @@ -227,14 +227,13 @@ endef
>   # 3) BR2_BACKUP_SITE if enabled, unless BR2_PRIMARY_SITE_ONLY is set
>   #
>   # Argument 1 is the source location
> -# Argument 2 is the source filename
>   #
>   # E.G. use like this:
> -# $(call DOWNLOAD,$(FOO_SITE),$(FOO_SOURCE))
> +# $(call DOWNLOAD,$(FOO_SITE))
>   ################################################################################
>
>   define DOWNLOAD
> -	$(call DOWNLOAD_INNER,$(1),$(if $(2),$(2),$(notdir $(1))))
> +	$(call DOWNLOAD_INNER,$(1),$(notdir $(1)))
>   endef
>
>   define DOWNLOAD_INNER
>
diff mbox

Patch

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 8e6f7a3..f3354d1 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -227,14 +227,13 @@  endef
 # 3) BR2_BACKUP_SITE if enabled, unless BR2_PRIMARY_SITE_ONLY is set
 #
 # Argument 1 is the source location
-# Argument 2 is the source filename
 #
 # E.G. use like this:
-# $(call DOWNLOAD,$(FOO_SITE),$(FOO_SOURCE))
+# $(call DOWNLOAD,$(FOO_SITE))
 ################################################################################
 
 define DOWNLOAD
-	$(call DOWNLOAD_INNER,$(1),$(if $(2),$(2),$(notdir $(1))))
+	$(call DOWNLOAD_INNER,$(1),$(notdir $(1)))
 endef
 
 define DOWNLOAD_INNER