summaryrefslogtreecommitdiffstats
path: root/scripts/lib/ptxd_make_world_patchin.sh
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2017-11-21 10:49:27 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-11-23 14:28:16 +0100
commitd364270362ad40e998abd2d93550d5585148e8e4 (patch)
tree59f6aa5ea4d0ff9e7811919dd5ad9412e7c270ca /scripts/lib/ptxd_make_world_patchin.sh
parent88fd49063f52cb756c4a03a1f124ac879dd25870 (diff)
downloadptxdist-d364270362ad40e998abd2d93550d5585148e8e4.tar.gz
ptxdist-d364270362ad40e998abd2d93550d5585148e8e4.tar.xz
scripts: consolidate file URL usage
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_world_patchin.sh')
-rw-r--r--scripts/lib/ptxd_make_world_patchin.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh
index 57f472130..81537f55a 100644
--- a/scripts/lib/ptxd_make_world_patchin.sh
+++ b/scripts/lib/ptxd_make_world_patchin.sh
@@ -439,12 +439,8 @@ ptxd_make_world_patchin_init()
fi
if [[ "${pkg_url}" =~ ^file:// ]]; then
- local url="${pkg_url//file:\/\//}"
+ local url="$(ptxd_file_url_path "${pkg_url}")"
# local directories are not intended to be patched
- if [[ ! "${url}" =~ ^/ ]]; then
- # ensure an absolute path for this BSP relative URL
- url="${PTXDIST_WORKSPACE}/${url}"
- fi
if [ -d "${url}" ]; then
echo "Local source directory detected, skipping patch-in step"
return