scripts: fix regression on reuse of shell environment variables

[AGL/meta-agl.git] / scripts / envsetup.sh

diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index 4925ef7..6ca10de 100644 (file)
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -7,10 +7,6 @@ fi
 
 MACHINE="$1"
 
-# set template conf for each <board/device>
-if [ -z "$TEMPLATECONF" ]; then
-    TEMPLATECONF="$PWD/meta-agl-demo/templates/$MACHINE/conf"
-fi
 
 case "$MACHINE" in
         "porter")
@@ -25,6 +21,13 @@ case "$MACHINE" in
                         fi
                 fi
 
+                if [ ! -d "$TEMPLATECONF" ]; then
+                    # set template conf for R-Car2 M2 Porter board
+                    TEMPLATECONF="$PWD/meta-renesas/meta-rcar-gen2/conf"
+                fi
+                ;;
+        "porter-nogfx")
+                MACHINE="porter"
                 if [ ! -d "$TEMPLATECONF" ]; then
                     # set template conf for R-Car2 M2 Porter board
                     TEMPLATECONF="$PWD/meta-renesas/meta-rcar-gen2/conf"
@@ -32,6 +35,10 @@ case "$MACHINE" in
                 ;;
         "intel-corei7-64")
                 ;;
+        "minnowboard")
+                # alias for minnowboardmax
+                MACHINE="intel-corei7-64"
+                ;;
         "qemux86")
                 ;;
         "qemux86-64")
@@ -44,9 +51,17 @@ case "$MACHINE" in
                 ;;
 esac
 
+# set template conf for each <board/device>
+if [ -z "$TEMPLATECONF" ]; then
+    if [ -d "$PWD/meta-agl-demo/templates/$MACHINE/conf" ]; then
+        TEMPLATECONF="$PWD/meta-agl-demo/templates/$MACHINE/conf"
+    fi
+fi
+
 echo "envsetup: Set '$1 as MACHINE."
 export MACHINE
 
+# fallback
 if [ ! -d "$TEMPLATECONF" ]; then
    # Allow to use templates at meta-agl-demo/conf
    TEMPLATECONF="$PWD/meta-agl-demo/conf"
@@ -62,6 +77,11 @@ else
   BUILD_DIR=build
 fi
 
+echo "envsetup: Setup build environment for poky/oe."
+echo -e
+
+source poky/oe-init-build-env $BUILD_DIR
+
 if [ -n "$DL_DIR" ]; then
         BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR"
 fi
@@ -72,9 +92,4 @@ fi
 
 export BB_ENV_EXTRAWHITE
 
-echo "envsetup: Setup build environment for poky/oe."
-echo -e
-
-source poky/oe-init-build-env $BUILD_DIR
-
 unset TEMPLATECONF