summaryrefslogtreecommitdiffstats
path: root/support
diff options
context:
space:
mode:
authorThomas De Schampheleire <thomas.de_schampheleire@nokia.com>2019-02-04 19:05:46 +0100
committerPeter Korsgaard <peter@korsgaard.com>2019-02-05 20:32:53 +0100
commitaa62b36456d143e4d2b7f1acd9a61d6bad52d3e5 (patch)
treeb7a403dfc22c7b609711a236c6dc20a769820436 /support
parent0478beaaad6312cc345fabcbc90ce68b391e3fb3 (diff)
downloadbuildroot-aa62b36456d143e4d2b7f1acd9a61d6bad52d3e5.tar.gz
buildroot-aa62b36456d143e4d2b7f1acd9a61d6bad52d3e5.zip
support/download/scp: fix download with scheme prefix 'scp://'
The scp download helper is broken when the server URL starts with 'scp://'. Such prefix is used in two situations: 1. to let FOO_SITE point to an scp location without explicitly having to set 'FOO_SITE_METHOD = scp' 2. when BR2_PRIMARY_SITE or BR2_BACKUP_SITE points to an scp location. In this case, there is no equivalent of 'SITE_METHOD'. Strip out the scheme prefix, similarly to how the 'file' download helper does it. That helper has the same cases as above. Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'support')
-rwxr-xr-xsupport/download/scp3
1 files changed, 3 insertions, 0 deletions
diff --git a/support/download/scp b/support/download/scp
index 49cfff2b9f..80cf495c4e 100755
--- a/support/download/scp
+++ b/support/download/scp
@@ -34,4 +34,7 @@ _scp() {
eval ${SCP} "${@}"
}
+# Remove any scheme prefix
+uri="${uri##scp://}"
+
_scp ${verbose} "${@}" "'${uri}/${filename}'" "'${output}'"
OpenPOWER on IntegriCloud