diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-02-12 09:47:24 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-02-12 09:47:24 +0000 |
| commit | 18879f04b583f2b0752fb4ba9705f539928ac4e2 (patch) | |
| tree | 23d47ff7d681c7e7060c4eee66c10dba37ff6082 /bin | |
| parent | 9d8d887df988ccb678052340cb08416d4be43cfd (diff) | |
| download | ptxdist-18879f04b583f2b0752fb4ba9705f539928ac4e2.tar.gz ptxdist-18879f04b583f2b0752fb4ba9705f539928ac4e2.tar.xz | |
* platformconfig: fix platformconfig file handling
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7748 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 02e6b2e0e..7a98dbb37 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -149,7 +149,7 @@ check_ptxconfig() { exit 1 fi - if [ ! -e "${PTXDIST_WORKSPACE}/platformconfig" ]; then + if [ ! -e "${PLATFORMCONFIG}" ]; then echo echo "${PROMPT}error: 'platformconfig' is missing" echo @@ -225,14 +225,16 @@ check_compiler() { build_toolchain=$(. "${PTXCONFIG}" && echo ${PTXCONF_BUILD_TOOLCHAIN}) [ -n "$build_toolchain" -o "$NATIVE" != "" ] && return -# -# Three things should be checked -# 1) Correct compiler name -# 2) Correct vendor if the vendor string is given -# 3) Correct compiler version if a specific compiler version is given -# - compiler=$(. "${PTXCONFIG}" && echo ${PTXCONF_COMPILER_PREFIX})gcc - vendor_should=$(. "${PTXCONFIG}" && echo ${PTXCONF_CROSSCHAIN_VENDOR}) + + # + # Three things should be checked + # 1) Correct compiler name + # 2) Correct vendor if the vendor string is given + # 3) Correct compiler version if a specific compiler version is given + # + + compiler=$(. ${PLATFORMCONFIG} && echo ${PTXCONF_COMPILER_PREFIX})gcc + vendor_should=$(. ${PLATFORMCONFIG} && echo ${PTXCONF_CROSSCHAIN_VENDOR}) if [ ! -z "$vendor_should" ]; then # yea! Vendor is specified in the project. So check for # toolchain vendor identification file @@ -752,14 +754,14 @@ platformconfig() { pushd $tmpdir > /dev/null # prepare everything to make kconfig see it's original environment - if [ -e "${PTXDIST_WORKSPACE}/platformconfig" ]; then - cp "$(readlink -f ${PTXDIST_WORKSPACE}/platformconfig)" .config + if [ -e "${PLATFORMCONFIG}" ]; then + cp "$(readlink -f ${PLATFORMCONFIG})" .config fi # store boardsetup "${PTXDIST_TOPDIR}/scripts/kconfig/mconf" "${kconfig}" - echo "${PROMPT}saving ${PTXDIST_WORKSPACE}/platformconfig" - cp .config "$(readlink -f ${PTXDIST_WORKSPACE}/platformconfig)" + echo "${PROMPT}saving ${PLATFORMCONFIG}" + cp .config "$(readlink -f ${PLATFORMCONFIG})" popd > /dev/null echo "${PROMPT}cleanup..." @@ -1122,7 +1124,7 @@ while [ "$#" != "0" ]; do echo exit 1 fi - if [ -f "platformconfig" ]; then + if [ -f "${PLATFORMCONFIG}" ]; then echo echo -n "${PROMPT}warning: overwrite existing platformconfig [y/n]? " read answer @@ -1134,7 +1136,7 @@ while [ "$#" != "0" ]; do fi echo echo "${PROMPT}selecting platformconfig \"$1\"" - ln -sf $1 platformconfig + ln -sf $1 ${PLATFORMCONFIG} echo "${PROMPT}done." echo exit 0 |