summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2014-03-03 11:24:42 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2014-03-03 16:52:17 +0100
commit94f50c8129be7eb3732c0ddb4ddc8faa654a306d (patch)
treeb545585c5c8f0aeeba2c885438ba8b5f2038930d /scripts
parenta292c644c731190ab87a271fabb21d1cd2c00789 (diff)
downloadptxdist-94f50c8129be7eb3732c0ddb4ddc8faa654a306d.tar.gz
ptxdist-94f50c8129be7eb3732c0ddb4ddc8faa654a306d.tar.xz
ptxd_make_world_extract: don't break packages with ${pkg_deprecated_extract_dir} set
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/ptxd_make_world_extract.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_make_world_extract.sh b/scripts/lib/ptxd_make_world_extract.sh
index 92d29f799..dc32f7548 100644
--- a/scripts/lib/ptxd_make_world_extract.sh
+++ b/scripts/lib/ptxd_make_world_extract.sh
@@ -20,12 +20,12 @@ ptxd_make_world_extract() {
return
fi
- pkg_extract_dir="${pkg_deprecated_extract_dir:-${pkg_extract_dir}}"
-
if [ "${pkg_dir%/}" = "${pkg_extract_dir}" ]; then
ptxd_bailout "<PKG>_DIR cannot be the $(ptxd_print_path ${pkg_extract_dir}). There is something wrong with the package definition."
fi
+ pkg_extract_dir="${pkg_deprecated_extract_dir:-${pkg_extract_dir}}"
+
case "${pkg_url}" in
lndir://*)
local url="${pkg_url//lndir:\/\//}"