aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Angelo Compagnucci <angelo@amarulasolutions.com>2018-05-08 15:28:31 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-05-13 22:23:13 +0200
commita9bb361435532d00bbcff6fed97618b68441b9cc (patch)
tree5fe4df24d1dbd9dda1a4aa29ab9fa6535d98d511
parentc3e62d39844b28b59650747e59e86a21d71f05c8 (diff)
downloadbuildroot-a9bb361435532d00bbcff6fed97618b68441b9cc.tar.gz
buildroot-a9bb361435532d00bbcff6fed97618b68441b9cc.tar.bz2
support/download/file: fix file:// protocol handling
Since the rework of the download infrastructure, the "file" download helper gets passed an URL that starts with file://, but forgets to strip it before passing it to "cp", causing a failure as the "cp" program isn't prepared for file paths starting with file://. This is fixed by stripping the file:// at the beginning of the URL. In addition, the path passed to cp lacked a slash between the directory path and the filename part of the url. This is fixed by adding a slash at the appropriate places. Fixes the following build failure when the "file" download method is used: cp: cannot stat 'file:///home/angelo/DEV/TOOLCHAINSarmv7-eabihf--glibc--bleeding-edge-2017.11-1.tar.bz2': No such file or directory Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rwxr-xr-xsupport/download/file2
1 files changed, 1 insertions, 1 deletions
diff --git a/support/download/file b/support/download/file
index fefd6d271c..6dd37b04dc 100755
--- a/support/download/file
+++ b/support/download/file
@@ -40,4 +40,4 @@ _localfiles() {
eval ${LOCALFILES} "${@}"
}
-_localfiles ${verbose} "'${dir}${file}'" "'${output}'"
+_localfiles ${verbose} "'${dir##file://}/${file}'" "'${output}'"