X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fenvsetup.sh;h=b30e0a66b3d6cdab763cc62e16ec396e246c0451;hb=04b8509c8a8f77d4fe3fed8883ceda61eb69069b;hp=79d2a25d8dec5b00010267141130342d890bad6d;hpb=f05bcdadc5422b0d7fa9b094aec256c3e86791c2;p=AGL%2Fmeta-agl.git

diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index 79d2a25d8..b30e0a66b 100644
--- 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,19 +35,33 @@ case "$MACHINE" in
                 ;;
         "intel-corei7-64")
                 ;;
+        "minnowboard")
+                # alias for minnowboardmax
+                MACHINE="intel-corei7-64"
+                ;;
         "qemux86")
                 ;;
         "qemux86-64")
                 ;;
+        "wandboard")
+                ;;
         *)
                 # nothing to do here
                 echo "WARN: '$MACHINE' is not tested by AGL Distro"
                 ;;
 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"
@@ -60,11 +77,6 @@ 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
@@ -75,4 +87,9 @@ 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