From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] pkg-download.mk: do not add a trailing slash to <PKG>_SITE
Date: Wed, 04 Apr 2018 08:40:47 +0200 [thread overview]
Message-ID: <878ta3o4nk.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <20180404063051.12111-1-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 4 Apr 2018 08:30:51 +0200")
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
> Fixes
> http://autobuild.buildroot.net/results/734/7342b25f01d60cafc4a5422a5a1c282629f361c5/
> $(dir does not strip last path separator and the wget wrapper adds a '/'
> between the -u argument and the filename when it reconstructs the URL,
> leading us to have two slashes before the filename when accessing the
> upstream location.
> Most upstream servers ignores this, but not all - Leading to download issues
> from pypi.
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
> package/pkg-download.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> index 7ed95f2b2c..2c4ad3ba2c 100644
> --- a/package/pkg-download.mk
> +++ b/package/pkg-download.mk
> @@ -82,7 +82,7 @@ endif
> ifeq ($(BR2_PRIMARY_SITE_ONLY),)
> DOWNLOAD_URIS += \
> - -u $($(PKG)_SITE_METHOD)+$(dir $(call qstrip,$(1)))
> + -u $($(PKG)_SITE_METHOD)+$(patsubst %/,%,$(dir $(call qstrip,$(1))))
Alternatively I *THINK* we can just use $($(PKG)_SITE) here.
--
Bye, Peter Korsgaard
next prev parent reply other threads:[~2018-04-04 6:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-04 6:30 [Buildroot] [PATCH] pkg-download.mk: do not add a trailing slash to <PKG>_SITE Peter Korsgaard
2018-04-04 6:40 ` Peter Korsgaard [this message]
2018-04-04 22:33 ` Arnout Vandecappelle
2018-04-05 6:35 ` Peter Korsgaard
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=878ta3o4nk.fsf@dell.be.48ers.dk \
--to=peter@korsgaard.com \
--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