summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2017-11-09 12:02:38 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-11-17 17:14:51 +0100
commit84c5ccf51760d5fb02144f52e107ea5f5bbe3e3c (patch)
tree2548bfb6c7e8e287b4f22d461a2d03661be77560 /scripts/lib
parent71a51f1ef212f175aadd1369f02d0442a6822033 (diff)
downloadptxdist-84c5ccf51760d5fb02144f52e107ea5f5bbe3e3c.tar.gz
ptxdist-84c5ccf51760d5fb02144f52e107ea5f5bbe3e3c.tar.xz
ptxd_make_world_extract: ensure absolute path
'file://' is interpreted as a BSP relative path, while 'file:///' is interpreted as a filesystem absolute path. To be independent from the current working path, the BSP relative path will now be extended to a filesystem absolute path with the main BSP path. Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/ptxd_make_world_extract.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/lib/ptxd_make_world_extract.sh b/scripts/lib/ptxd_make_world_extract.sh
index 970fb0b8d..a4bb98b83 100644
--- a/scripts/lib/ptxd_make_world_extract.sh
+++ b/scripts/lib/ptxd_make_world_extract.sh
@@ -43,6 +43,10 @@ ptxd_make_world_extract() {
;;
file://*)
local url="${pkg_url//file:\/\//}"
+ if [[ ! "${url}" =~ ^/ ]]; then
+ # relative to absolute path
+ url="${PTXDIST_WORKSPACE}/${url}"
+ fi
if [ -d "${url}" ]; then
echo "local directory instead of tar file, linking build dir"
ln -sf "$(ptxd_abspath "${url}")" "${pkg_dir}"