From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] fix corrupted download url of extra packages
Date: Fri, 8 Nov 2019 18:28:19 +0100 [thread overview]
Message-ID: <20191108172819.GG3419@scaer> (raw)
In-Reply-To: <20191105090448.99235-2-jemy.zhang@gmail.com>
Jemy, All,
On 2019-11-05 17:04 +0800, jemy.zhang at gmail.com spake thusly:
> From: "Jemy Zhang" <jemy.zhang@gmail.com>
>
> If the download url of extra packages contains '+', the contents before
> '+' will be parsed as SITE_METHOD, the original download url corrupted.
>
> check with android-tools package.
Indeed this is broken. Thank you very much for noticing the issue.
> Signed-off-by: Jemy Zhang <jemy.zhang@gmail.com>
> ---
> package/pkg-generic.mk | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index 893faba22a..bb0ca939a3 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -523,8 +523,9 @@ endif
> $(2)_ALL_DOWNLOADS = \
> $$(if $$($(2)_SOURCE),$$($(2)_SITE_METHOD)+$$($(2)_SITE)/$$($(2)_SOURCE)) \
> $$(foreach p,$$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS),\
> - $$(if $$(findstring ://,$$(p)),$$(p),\
> - $$($(2)_SITE)/$$(p)))
> + $$(call getschemeplusuri,$$(call qstrip,\
> + $$(if $$(findstring ://,$$(p)),$$(p),\
> + $$($(2)_SITE)/$$(p))),urlencode))
I am not certain that we want to unconditionally enforce urlencode on
all additional downloads...
Instead, I think we should just replicate the site method for extra
downloads that use the same site as the main download.
I've sent a patch that does just that:
https://patchwork.ozlabs.org/patch/1192073/
Can you see if that fixes it for you (it did for me, but if you have an
alternate test-case, that'd be nice to have feedback on it too).
Thanks again for the report! :-)
Regards,
Yann E. MORIN.
> ifndef $(2)_SITE
> ifdef $(3)_SITE
> --
> 2.22.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2019-11-08 17:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 9:04 [Buildroot] [PATCH 0/1] download url broken if url include '+' jemy.zhang at gmail.com
2019-11-05 9:04 ` [Buildroot] [PATCH 1/1] fix corrupted download url of extra packages jemy.zhang at gmail.com
2019-11-08 17:28 ` Yann E. MORIN [this message]
2019-11-08 22:26 ` jemy zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191108172819.GG3419@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox