Patchwork pkg-download.mk: Add missing argument when downloading from primary mirror (scp)

login
register
mail settings
Submitter Thomas De Schampheleire
Date May 23, 2012, 7:30 p.m.
Message ID <51385d7304116ae16504.1337801436@beantl019720>
Download mbox | patch
Permalink /patch/161026/
State Accepted
Commit 3ae7d814075095b43e25c8ef11be6a14234241cc
Headers show

Comments

Thomas De Schampheleire - May 23, 2012, 7:30 p.m.
This problem was already fixed by Markos Chandras for wget, but not for scp.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
 package/pkg-download.mk |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Thomas De Schampheleire - May 23, 2012, 7:41 p.m.
Hi,

On Wed, May 23, 2012 at 9:30 PM, Thomas De Schampheleire
<patrickdepinguin+buildroot@gmail.com> wrote:
> This problem was already fixed by Markos Chandras for wget, but not for scp.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> ---
>  package/pkg-download.mk |  2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> --- a/package/pkg-download.mk
> +++ b/package/pkg-download.mk
> @@ -206,7 +206,7 @@ endef
>  define DOWNLOAD_INNER
>        $(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \
>                case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \
> -                       scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
> +                       scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \
>                        *) $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \
>                esac ; \
>        fi ; \

Since this is a regression (worked fine in 2012.02) I think this fix
should be in 2012.05.

Best regards,
Thomas
Peter Korsgaard - May 23, 2012, 7:50 p.m.
>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com> writes:

 Thomas> This problem was already fixed by Markos Chandras for wget, but
 Thomas> not for scp.

 Thomas> Signed-off-by: Thomas De Schampheleire
 Thomas> <thomas.de.schampheleire@gmail.com>

Committed, thanks.

Patch

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -206,7 +206,7 @@  endef
 define DOWNLOAD_INNER
 	$(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \
 		case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \
-			scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
+			scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \
 			*) $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \
 		esac ; \
 	fi ; \