diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-08-23 14:15:21 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-08-24 12:07:16 +0200 |
| commit | 19d9bb1543fe77dfe8d11cba5ebc30f1b91a6348 (patch) | |
| tree | 49f3314309ca989cd2c36e17fc1dd3a068c35efa /bin | |
| parent | bc261f35d0f84ae7dcfde74a2fa2aef234267ec8 (diff) | |
| download | ptxdist-19d9bb1543fe77dfe8d11cba5ebc30f1b91a6348.tar.gz ptxdist-19d9bb1543fe77dfe8d11cba5ebc30f1b91a6348.tar.xz | |
[ptxdist] add fallback to configs/ptxconfig if selected_ptxconfig does not exist.
Selecting a non-existing config with '--ptxconfig=' or a broken
selected_ptxconfig link will still fail.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 3657ef90b..ff785890c 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -12,6 +12,7 @@ PROMPT="ptxdist: " # defaults # PTXDIST_PTXCONFIG_DEFAULT='${PTXDIST_WORKSPACE}/selected_ptxconfig' +PTXDIST_PTXCONFIG_FALLBACK='${PTXDIST_WORKSPACE}/configs/ptxconfig' PTXDIST_PLATFORMCONFIG_DEFAULT='${PTXDIST_WORKSPACE}/selected_platformconfig' PTXDIST_COLLECTIONCONFIG_DEFAULT='${PTXDIST_WORKSPACE}/selected_collectionconfig' PTXDIST_TOOLCHAIN_DEFAULT='${PTXDIST_WORKSPACE}/selected_toolchain' @@ -1305,6 +1306,10 @@ parse_first() ;; esac || return done + if [ "${PTXDIST_PTXCONFIG}" = "${PTXDIST_PTXCONFIG_DEFAULT}" -a \ + ! -e "${PTXDIST_PTXCONFIG}" -a -e "${PTXDIST_PTXCONFIG_FALLBACK}" ]; then + PTXDIST_PTXCONFIG="${PTXDIST_PTXCONFIG_FALLBACK}" + fi } @@ -1958,6 +1963,7 @@ setup_topdir() { PTXDIST_WORKSPACE="$(pwd)" eval PTXDIST_PTXCONFIG_DEFAULT="${PTXDIST_PTXCONFIG_DEFAULT}" + eval PTXDIST_PTXCONFIG_FALLBACK="${PTXDIST_PTXCONFIG_FALLBACK}" eval PTXDIST_PLATFORMCONFIG_DEFAULT="${PTXDIST_PLATFORMCONFIG_DEFAULT}" eval PTXDIST_COLLECTIONCONFIG_DEFAULT="${PTXDIST_COLLECTIONCONFIG_DEFAULT}" eval PTXDIST_TOOLCHAIN_DEFAULT="${PTXDIST_TOOLCHAIN_DEFAULT}" |