diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-22 17:55:22 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-08-17 12:33:41 +0200 |
| commit | eb169b366ac58921304549123a724cbd13af50e2 (patch) | |
| tree | 685b5b77d7df13692ce624f2a1f56dcd4521070d /tests | |
| parent | 3d0a3ee1e0c55f1d0df8dc35f976bf2cfb74775a (diff) | |
| download | ptxdist-eb169b366ac58921304549123a724cbd13af50e2.tar.gz ptxdist-eb169b366ac58921304549123a724cbd13af50e2.tar.xz | |
[make_barebox_env] create the config file here
Also look for platform specific versions.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/make_barebox_env | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/tests/make_barebox_env b/tests/make_barebox_env index ac130bb1d..6c0ff97f3 100755 --- a/tests/make_barebox_env +++ b/tests/make_barebox_env @@ -1,29 +1,37 @@ #!/bin/bash -set -e -PTXDIST_SETENV_BAREBOX_ENV="${1}" -ENVTMPDIR="$(mktemp -d "${PTXDIST_TEMPDIR}/barebox_env.XXXXXX")" +BAREBOX_ENV="${1}" +ENVTMPDIR="$(mktemp -d "${PTXDIST_TEMPDIR}/barebox_env.XXXXXX")" || +ptxd_bailout "mktemp failed." # IMAGEDIR is not set if we use this script with "ptxdist test" directly # since it comes from kwraper. [ -z "${IMAGEDIR}" ] && export IMAGEDIR=${PTXDIST_PLATFORMDIR}/images -if [ ! -r ${PTXDIST_PLATFORMCONFIGDIR}/barebox-env/config ]; then - echo "ERROR: missing valid ${PTXDIST_PLATFORMCONFIGDIR}/barebox-env/config" >&2 - exit 1 -fi +ptxd_get_path \ + "${PTXDIST_PLATFORMCONFIGDIR}/barebox-env{${PTXDIST_PLATFORMSUFFIX},}/config.in{${PTXDIST_PLATFORMSUFFIX},}" \ + "${PTXDIST_PLATFORMCONFIGDIR}/barebox-env{${PTXDIST_PLATFORMSUFFIX},}/config{${PTXDIST_PLATFORMSUFFIX},}" || +ptxd_bailout "Could not find Barebox environment." -tar -C "${PTXDIST_PLATFORMCONFIGDIR}/barebox-env/" -c . \ +CONFFILE_IN="${ptxd_reply}" +ENVDIR="$(dirname "${CONFFILE_IN}")" +CONFFILE="${ENVDIR}/config" + +ptxd_replace_magic "${CONFFILE_IN}" > "${CONFFILE}" + +tar -C "${ENVDIR}" -c . \ --exclude .svn \ --exclude .pc \ --exclude .git \ --exclude "config.in" \ + --exclude "config.in${PTXDIST_PLATFORMSUFFIX}" \ --exclude "*/*~" \ | tar -C "${ENVTMPDIR}" -x -bareboxenv -s "${ENVTMPDIR}" "${IMAGEDIR}/barebox-environment" +bareboxenv -s "${ENVTMPDIR}" "${IMAGEDIR}/barebox-environment" || +ptxd_bailout "bareboxenv failed." # only copy the image if we are called by "test setenv" -[ -n "${PTXDIST_SETENV_BAREBOX_ENV}" ] && cp "${IMAGEDIR}/barebox-environment" "${PTXDIST_SETENV_BAREBOX_ENV}" +[ -n "${BAREBOX_ENV}" ] && cp "${IMAGEDIR}/barebox-environment" "${BAREBOX_ENV}" rm -rf "${ENVTMPDIR}" |