aboutsummaryrefslogtreecommitdiff
path: root/package/pkg-download.mk
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2018-04-04 08:30:51 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-04-05 08:34:36 +0200
commitfc49c92afc8478ed32ff4770d88b97081c7193d8 (patch)
tree89c0478a657efe1a21f51b4fab2690e9f5a95257 /package/pkg-download.mk
parent573ea2c7d4a69626155ef099fe767f9098869e49 (diff)
downloadbuildroot-fc49c92afc8478ed32ff4770d88b97081c7193d8.tar.gz
buildroot-fc49c92afc8478ed32ff4770d88b97081c7193d8.tar.bz2
pkg-download.mk: do not add a trailing slash to <PKG>_SITE
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. Notice: As pointed out by Arnout, we cannot simply use $(PKG)_SITE here as _PATCH and _EXTRA_DOWNLOADS may contain full URLs. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/pkg-download.mk')
-rw-r--r--package/pkg-download.mk2
1 files changed, 1 insertions, 1 deletions
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))))
ifneq ($(call qstrip,$(BR2_BACKUP_SITE)),)
DOWNLOAD_URIS += \
-u $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(PKG)_DL_SUBDIR)),urlencode) \