From d33e1cc64a0b204bbacca793569b581024133061 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= <jsmoeller@linuxfoundation.org>
Date: Fri, 19 Feb 2016 22:17:01 +0100
Subject: [PATCH] Allow alias names in envsetup.sh - here for minnowboard
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This commit allows us to define also alias names for MACHINE.
TEMPLATECONF moved down for this.

Change-Id: Ibec9882ac5a7c3bf734ead8a05b452bb655bbeeb
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 scripts/envsetup.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index 4925ef7e9..0b783e9a2 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")
@@ -32,6 +28,10 @@ case "$MACHINE" in
                 ;;
         "intel-corei7-64")
                 ;;
+        "minnowboard")
+                # alias for minnowboardmax
+                MACHINE="intel-corei7-64"
+                ;;
         "qemux86")
                 ;;
         "qemux86-64")
@@ -44,9 +44,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"
-- 
2.16.6