[base][PATCH v2 1/2] setup-environment: Add support for set distro

* [base][PATCH v2 1/2] setup-environment: Add support for set distro
@ 2016-11-07 13:29 Fabio Berton
  2016-11-07 13:29 ` [base][PATCH v2 2/2] setup-environment: Move error log from top to bottom Fabio Berton
  2016-11-07 17:11 ` [base][PATCH v2 1/2] setup-environment: Add support for set distro Lauren Post
  0 siblings, 2 replies; 3+ messages in thread
From: Fabio Berton @ 2016-11-07 13:29 UTC (permalink / raw)
  To: meta-freescale

To run setup-environment you need to set one of distros listed on
supported distros using command like:

MACHINE=imx6qsabresd DISTRO=fslc-framebuffer source setup-environment build

Note that DISTRO is a required variable and won't be set if not defined.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 setup-environment | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/setup-environment b/setup-environment
index 099b21b..797a6aa 100755
--- a/setup-environment
+++ b/setup-environment
@@ -27,19 +27,25 @@ usage()
 {
     echo -e "\nUsage: source $PROGNAME <build-dir>
     <build-dir>: specifies the build directory location (required)
+    <distro>:    specifies the distro name
 
 If undefined, this script will set \$MACHINE to 'imx6qsabresd'.
+You need to set DISTRO to use this environment.
 "
 
     ls sources/*/conf/machine/*.conf > /dev/null 2>&1
+    ls sources/meta-freescale-distro/conf/distro/fslc-*.conf > /dev/null 2>&1
     if [ $? -eq 0 ]; then
         echo -e "
 Supported machines: `echo; ls sources/*/conf/machine/*.conf \
 | sed s/\.conf//g | sed -r 's/^.+\///' | xargs -I% echo -e "\t%"`
 
-To build for a machine listed above, run this script as:
-MACHINE=<machine> source $PROGNAME <build-dir>
-"
+Supported distros: `echo; ls sources/meta-freescale-distro/conf/distro/fslc-*.conf \
+| sed s/\.conf//g | sed -r 's/^.+\///' | xargs -I% echo -e "\t%"`
+
+To build for a distro and machine listed above, run this script as:
+MACHINE=<machine> DISTRO=<distro> source $PROGNAME <build-dir>
+Ex: MACHINE=imx6qsabresd DISTRO=fslc-framebuffer source $PROGNAME build"
     fi
 }
 
@@ -105,7 +111,19 @@ if [ -z "$SDKMACHINE" ]; then
 fi
 
 if [ -z "$DISTRO" ]; then
-    DISTRO='poky'
+    echo "You must set DISTRO before setting up the environment."
+fi
+# Check the machine type specified
+LIST_DISTROS=`ls -1 $CWD/sources/meta-freescale-distro/conf/distro`
+VALID_DISTRO=`echo -e "$LIST_DISTROS" | grep ${DISTRO}.conf$ | wc -l`
+if [ "x$DISTRO" = "x" ] || [ "$VALID_DISTRO" = "0" ]; then
+    echo -e "The \$DISTRO you have specified ($DISTRO) is not supported by this build setup\n"
+    usage && clean_up
+    return 1
+else
+    if [ ! -e $1/conf/local.conf.sample ]; then
+        echo "Configuring for ${DISTRO}"
+    fi
 fi
 
 OEROOT=$PWD/sources/poky
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 3+ messages in thread