diff options
| author | Luotao Fu <l.fu@pengutronix.de> | 2009-01-29 20:26:11 +0000 |
|---|---|---|
| committer | Luotao Fu <l.fu@pengutronix.de> | 2009-01-29 20:26:11 +0000 |
| commit | f1a472ad3d6a76e007eddc9d18595f80babea5d3 (patch) | |
| tree | 0e9814a01d6ba25f940f47c049302cb7dab691a7 /tests | |
| parent | a9b51f7a59eb783b6ae2a037c2d62f99fcc54ad6 (diff) | |
| download | ptxdist-f1a472ad3d6a76e007eddc9d18595f80babea5d3.tar.gz ptxdist-f1a472ad3d6a76e007eddc9d18595f80babea5d3.tar.xz | |
* add platform suffix to uboot env template
* make filepaths whitespace safe
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9683 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/setenv | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/tests/setenv b/tests/setenv index 79ef84eaf..9f88e7bdb 100755 --- a/tests/setenv +++ b/tests/setenv @@ -5,20 +5,28 @@ if [ ! -e "${PTXDIST_BOARDSETUP}" ]; then exit 1 fi -CONFFILE=${PTXDIST_PLATFORMCONFIGDIR}/u-boot-env/config +CONFFILE="${PTXDIST_PLATFORMCONFIGDIR}/u-boot-env/config${PTXDIST_PLATFORMSUFFIX}" +if [ ! -r "${CONFFILE}.in" ]; then + if [ -r "`dirname "${CONFFILE}"`/config.in" ]; then + CONFFILE="`dirname "${CONFFILE}"`/config" + else + echo "Config file for uboot environment is missing!" + exit 1 + fi +fi #source and export variables, so we can access them later with awk. set -a -. ${PTXDIST_BOARDSETUP} +. "${PTXDIST_BOARDSETUP}" set +a #Replace @magics@ with PTXCONF-variables #FIXME: Warn if variable is empty? -awk 'match($0, "@[A-Z0-9_]+@") { var=substr($0,RSTART+1,RLENGTH-2); gsub( "@"var"@", ENVIRON[var]); } {print} ' $CONFFILE.in >$CONFFILE +awk 'match($0, "@[A-Z0-9_]+@") { var=substr($0,RSTART+1,RLENGTH-2); gsub("@"var"@", ENVIRON[var]); } {print} ' "${CONFFILE}".in >"${CONFFILE}" PTXDIST_SETENV_U_BOOT_V2_ENV="$(mktemp "${PTXCONF_BOARDSETUP_TFTP_PATH}/u-boot-v2-environment.XXXXXX")" -chmod 644 ${PTXDIST_SETENV_U_BOOT_V2_ENV} +chmod 644 "${PTXDIST_SETENV_U_BOOT_V2_ENV}" -${PTXDIST_TOPDIR}/tests/kwrapper setenv ${CONFFILE} ${PTXDIST_SETENV_U_BOOT_V2_ENV} +"${PTXDIST_WORKSPACE}/tests/kwrapper" setenv "${CONFFILE}" "${PTXDIST_SETENV_U_BOOT_V2_ENV}" -rm -rf ${PTXDIST_SETENV_U_BOOT_V2_ENV} +rm -rf "${PTXDIST_SETENV_U_BOOT_V2_ENV}" |