diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2014-10-16 16:13:32 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@digia.com> | 2014-10-17 09:53:42 +0300 |
| commit | b8caaf7e86f2417d2abbeb30c71ce4bb1f11883c (patch) | |
| tree | 6645f5adc82834fa16bc86e212d835f4d0cfa4a9 /scripts | |
| parent | 61f01397bff9e6f9cab09f9bf66cd754b05cb5b9 (diff) | |
| download | meta-boot2qt-b8caaf7e86f2417d2abbeb30c71ce4bb1f11883c.tar.gz | |
Fixes for setup scripts
Change-Id: Ib506ebd57e0943cbbd2b4dfcb6291a3938807c1f
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setup-environment.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 2ff9e29..92e75aa 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
| @@ -40,13 +40,13 @@ if [ "$(basename $0)" = "${THIS_SCRIPT}" ]; then | |||
| 40 | exit 1 | 40 | exit 1 |
| 41 | fi | 41 | fi |
| 42 | 42 | ||
| 43 | BUILDDIR=${BUILDDIR:-build-${MACHINE}} | ||
| 44 | |||
| 45 | if [ -z "$MACHINE" ]; then | 43 | if [ -z "$MACHINE" ]; then |
| 46 | echo "Error: MACHINE environment variable not defined" | 44 | echo "Error: MACHINE environment variable not defined" |
| 47 | return 1 | 45 | return 1 |
| 48 | fi | 46 | fi |
| 49 | 47 | ||
| 48 | BUILDDIR=${BUILDDIR:-build-${MACHINE}} | ||
| 49 | |||
| 50 | if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then | 50 | if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then |
| 51 | case ${MACHINE} in | 51 | case ${MACHINE} in |
| 52 | apalis-imx6) | 52 | apalis-imx6) |