diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-03-17 08:57:55 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-03-28 10:19:19 +0200 |
| commit | e449e28d4edfbf0ebc1fe9bfbbf0fa93e134e1c2 (patch) | |
| tree | cbae8ac79f096ea1474f45f605c26ea4dcdab7a9 | |
| parent | 85be3bf0382d8734327757f034559628721bcb52 (diff) | |
| download | ptxdist-e449e28d4edfbf0ebc1fe9bfbbf0fa93e134e1c2.tar.gz ptxdist-e449e28d4edfbf0ebc1fe9bfbbf0fa93e134e1c2.tar.xz | |
libptxdist: load scripts/lib/ptxd_make_* scripts from the BSP
this makes it possible to overwrite stuff exported during ptxd_make
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_lib_00-init.sh | 3 | ||||
| -rw-r--r-- | scripts/libptxdist.sh | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_lib_00-init.sh b/scripts/lib/ptxd_lib_00-init.sh index 02a48e7c7..ac20b29fb 100644 --- a/scripts/lib/ptxd_lib_00-init.sh +++ b/scripts/lib/ptxd_lib_00-init.sh @@ -101,6 +101,9 @@ ptxd_init_ptxdist_path() { PTXDIST_PATH_PLATFORMS="${PTXDIST_PATH//://platforms:}" export PTXDIST_PATH_PLATFORMS + PTXDIST_PATH_SCRIPTS="${PTXDIST_PATH//://scripts:}" + export PTXDIST_PATH_SCRIPTS + ptxd_init_ptxdist_path_sysroot } diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh index 8a379f134..3e1658d4a 100644 --- a/scripts/libptxdist.sh +++ b/scripts/libptxdist.sh @@ -337,8 +337,12 @@ export -f ptxd_kconfig # ("scripts/lib/ptxd_make_"*.sh) # ptxd_make() { - for lib in "${SCRIPTSDIR}/lib/ptxd_make_"*.sh; do - source "${lib}" || ptxd_bailout "failed to source lib: ${lib}" + local lib i + 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 + source "${lib}" || ptxd_bailout "failed to source lib: ${lib}" + done done ${PTX_NICE:+nice -n ${PTX_NICE}} "${PTXCONF_SETUP_HOST_MAKE}" \ "${PTX_MAKE_ARGS[@]}" "${PTXDIST_PARALLELMFLAGS_EXTERN}" \ |