summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-04-12 23:12:31 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2011-04-13 20:27:47 +0200
commit763f18db7e94480c446018637a47b10c0072a397 (patch)
treeb26a9f15315f7eda48b5865c3008b0a1ffc1dce7
parentfd1b37f035ae38cf25a787e4ee4dab643ce5ee32 (diff)
downloadptxdist-2011.04.1.tar.gz
ptxdist-2011.04.1.tar.xz
libptxdist: fix including scripts/lib/ptxd_make_*.shptxdist-2011.04.1stable/ptxdist-2011.04.x
e449e28d4edfbf0ebc1fe9bfbbf0fa93e134e1c2 broke BSPs with a scripts/ directory but no file matching scripts/lib/ptxd_make_*.sh Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> (cherry picked from commit 05eef40ed8dc519509bac7717c1810d1eb99a66f) Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--scripts/libptxdist.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh
index 3e1658d4a..48dbd646c 100644
--- a/scripts/libptxdist.sh
+++ b/scripts/libptxdist.sh
@@ -338,9 +338,12 @@ export -f ptxd_kconfig
#
ptxd_make() {
local lib i
+ local -a dir
ptxd_in_path PTXDIST_PATH_SCRIPTS || return
- for ((i=$((${#ptxd_reply[@]}-1)); i>=0; i--)) do
- for lib in "${ptxd_reply[${i}]}/lib/ptxd_make_"*.sh; do
+ dir=( "${ptxd_reply[@]}" )
+ for ((i=$((${#dir[@]}-1)); i>=0; i--)) do
+ ptxd_get_path "${dir[${i}]}/lib/ptxd_make_"*.sh || continue
+ for lib in "${ptxd_reply[@]}"; do
source "${lib}" || ptxd_bailout "failed to source lib: ${lib}"
done
done