diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-02-26 18:41:24 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-02-26 21:04:12 +0100 |
| commit | dd7cb20fb3fdf1c6db7dadf25040e2726bd3f16f (patch) | |
| tree | 97141b74fb01b3a992386d8dfc5f3e651369c6cb /bin | |
| parent | e03dff616fd43441c4017f3345e11186a2ea1e42 (diff) | |
| download | ptxdist-dd7cb20fb3fdf1c6db7dadf25040e2726bd3f16f.tar.gz ptxdist-dd7cb20fb3fdf1c6db7dadf25040e2726bd3f16f.tar.xz | |
[ptxdist] setup PTXDIST_PLATFORMCONFIGDIR even if no platformconfig selected
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 89b1b3ee8..4f2099db1 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -2276,12 +2276,18 @@ setup_platform() { # reread vars with correct PTXDIST_PLATFORMDIR source "${SCRIPTSDIR}/ptxdist_vars.sh" || return - local cfg_dir - if [ -e "${PTXDIST_PLATFORMCONFIG}" ]; then - cfg_dir="$(dirname "$(readlink -f "${PTXDIST_PLATFORMCONFIG}")")" || return - fi + local cfg_file cfg_dir + for cfg_file in \ + "${PTXDIST_PLATFORMCONFIG}" \ + "${PTXDIST_PTXCONFIG}"; do + [ -e "${cfg_file}" ] || continue + + cfg_file="$(readlink -f "${cfg_file}")" || return + cfg_dir="${cfg_file%/*}" + break + done - PTXDIST_PLATFORMCONFIGDIR="${cfg_dir}" + PTXDIST_PLATFORMCONFIGDIR="${cfg_dir:-${PTXDIST_WORKSPACE}}" PTXDIST_BOARDSETUP="${HOME}/.ptxdist/boardsetup.${project}${project_version}.${platform}" } |