new configuration templates based on fragments

This is the application of the process proposed here:
https://lists.linuxfoundation.org/pipermail/automotive-discussions/2016-June/002232.html

Bug-AGL: SPEC-180

Change-Id: I5a7015fa810547a9ecf4fb096367323af3cdc670
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>

3 files changed, 537 insertions, 202 deletions

diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
new file mode 100755
index 000000000..6be95d0fa
--- /dev/null
+++ b/scripts/.aglsetup_genconfig.bash
@@ -0,0 +1,400 @@
+#!/bin/bash
+
+################################################################################
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Stéphane Desneux <sdx@iot.bzh>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+################################################################################
+
+# this script shouldn't be called directly, but through aglsetup.sh that will in 
+# turn execute (source) generated instructions back in the parent shell, 
+# whether it's bash, zsh, or any other supported shell
+
+VERSION=1.0.0
+AGL_REPOSITORIES="meta-agl meta-agl-extra meta-agl-contrib"
+DEFAULT_MACHINE=qemux86-64
+DEFAULT_BUILDDIR=./build
+VERBOSE=0
+DEBUG=0
+
+#SCRIPT=$(basename $BASH_SOURCE)
+SCRIPT=aglsetup.sh
+SCRIPTDIR=$(cd $(dirname $BASH_SOURCE) && pwd -P)
+METADIR=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P)
+
+function info() { echo "$@" >&2; }
+function infon() { echo -n "$@" >&2; }
+function error() { echo "ERROR: $@" >&2; return 1; }
+function verbose() { [[ $VERBOSE == 1 ]] && echo "$@" >&2; return 0; }
+function debug() { [[ $DEBUG == 1 ]] && echo "DEBUG: $@" >&2; return 0;}
+
+info "------------ $SCRIPT: Starting"
+
+function list_machines() {
+	for x in $@; do
+		for y in $(ls -d $METADIR/$x/templates/machine/* 2>/dev/null); do
+			echo -n "$(basename $y) "
+		done
+	done
+}
+
+function list_all_machines() {
+	for x in $AGL_REPOSITORIES; do
+		[[ ! -d $METADIR/$x ]] && continue
+		list_machines $x
+	done
+}
+
+function list_features() {
+	for x in $@; do
+		for y in $(ls -d $METADIR/$x/templates/feature/* 2>/dev/null); do
+			echo -n "$(basename $y) "
+		done
+	done
+}
+
+function list_all_features() {
+	for x in $AGL_REPOSITORIES; do
+		[[ ! -d $METADIR/$x ]] && continue
+		list_features $x
+	done
+}
+
+function find_machine_dir() {
+	machine=$1
+	for x in $AGL_REPOSITORIES; do
+		[[ ! -d $METADIR/$x ]] && continue
+		dir=$METADIR/$x/templates/machine/$machine
+		[[ -d $dir ]] && { echo $dir; return 0; }
+	done
+	return 1
+}
+
+function find_feature_dir() {
+	feature=$1
+	for x in $AGL_REPOSITORIES; do
+		[[ ! -d $METADIR/$x ]] && continue
+		dir=$METADIR/$x/templates/feature/$feature
+		[[ -d $dir ]] && { echo $dir; return 0; }
+	done
+	return 1
+}
+
+function usage() {
+    cat <<EOF >&2
+Usage: . $SCRIPT [options] [feature [feature [... ]]]
+
+Version: $VERSION
+Compatibility: bash, zsh, ksh
+
+Options:
+   -m|--machine <machine>
+      what machine to use
+      default: '$DEFAULT_MACHINE'
+   -b|--build <directory>
+      build directory to use
+      default: '$DEFAULT_BUILDDIR'
+   -s|--script <filename>
+      file where setup script is generated
+      default: none (no script)
+   -f|--force
+      flag to force overwriting any existing configuration
+      default: false
+   -v|--verbose
+      verbose mode
+      default: false
+   -d|--debug
+      debug mode
+      default: false
+   -h|--help
+      get some help
+
+EOF
+	
+	echo "Available machines:" >&2
+	for x in $AGL_REPOSITORIES; do
+		[[ ! -d $METADIR/$x ]] && continue
+		echo "   [$x]"
+		for y in $(list_machines $x); do 
+			[[ $y == $DEFAULT_MACHINE ]] && def="* " || def="  "
+			echo "     $def$y"
+		done
+	done
+	echo >&2
+
+	echo "Available features:" >&2
+	for x in $AGL_REPOSITORIES; do
+		[[ ! -d $METADIR/$x ]] && continue
+		echo "   [$x]"
+		for y in $(list_features $x); do
+			echo "       $y"
+		done
+	done
+	echo >&2
+}
+
+function append_fragment() {
+	basefile=$1; shift # output file
+	f=$1; shift # input file
+	label=$(echo "$@")
+
+	debug "adding fragment to $basefile: $f"
+	echo >>$basefile
+	echo "# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #" >>$basefile
+	echo "# fragment { " >>$basefile
+	[[ -f $f ]] && echo "# $f" >>$basefile || true
+	echo "#" >>$basefile
+	[[ -n "$label" ]] && echo "$label" >>$basefile
+	[[ -f $f ]] && cat $f >>$basefile || true
+	echo "#" >>$basefile
+	echo "# }" >>$basefile
+	echo "# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #" >>$basefile
+	[[ -f $f ]] && echo $f >>$BUILDDIR/conf/fragments.log || true
+}
+
+function execute_setup() {
+	script=$1
+	debug "Executing script $script"
+	opts=
+	[[ $DEBUG == 1 ]] && opts="$opts -x"
+	pushd $BUILDDIR &>/dev/null
+		$BASH $opts $script \
+			&& rc=0 \
+			|| { rc=$?; error "Script $script failed"; }
+	popd &>/dev/null
+	return $rc
+}
+
+# process all fragments
+FRAGMENTS_BBLAYERS=""
+FRAGMENTS_LOCALCONF=""
+FRAGMENTS_SETUP=""
+function process_fragments() {
+	for dir in "$@"; do
+		debug "processing fragments in dir $dir"
+
+		verbose "   Searching fragments: $dir"
+
+		# lookup for files with priorities specified: something like xx_bblayers.conf.yyyyy.inc
+		for x in $(ls $dir/??[._]bblayers.conf*.inc 2>/dev/null); do
+			FRAGMENTS_BBLAYERS="$FRAGMENTS_BBLAYERS $(basename $x):$x"
+			verbose "      priority $(basename $x | cut -c1-2): $(basename $x)"
+		done
+
+		# same for local.conf
+		for x in $(ls $dir/??[._]local.conf*.inc 2>/dev/null); do
+			FRAGMENTS_LOCALCONF="$FRAGMENTS_LOCALCONF $(basename $x):$x"
+			verbose "      priority $(basename $x | cut -c1-2): $(basename $x)"
+		done
+
+		# same fot setup.sh
+		for x in $(ls $dir/??[._]setup*.sh 2>/dev/null); do
+			FRAGMENTS_SETUP="$FRAGMENTS_SETUP $(basename $x):$x"
+			verbose "      priority $(basename $x | cut -c1-2): $(basename $x)"
+		done
+	done
+}
+
+GLOBAL_ARGS=( "$@" )
+debug "Parsing arguments: $@"
+TEMP=$(getopt -o m:b:s:fvdh --long machine:,builddir:,script:,force,verbose,debug,help -n $SCRIPT -- "$@")
+[[ $? != 0 ]] && { usage; exit 1; }
+eval set -- "$TEMP"
+
+set -e
+
+### default options values
+MACHINE=$DEFAULT_MACHINE
+BUILDDIR=$DEFAULT_BUILDDIR
+SETUPSCRIPT=
+FORCE=
+
+while true; do
+	case "$1" in
+		-m|--machine)  MACHINE=$2; shift 2;;
+		-b|--builddir) BUILDDIR=$2; shift 2;;
+		-s|--setupscript) SETUPSCRIPT=$2; shift 2;;
+		-f|--force) FORCE=1; shift;;
+		-v|--verbose) VERBOSE=1; shift;;
+		-d|--debug) VERBOSE=1; DEBUG=1; shift;;
+		-h|--help)     HELP=1; shift;;
+		--)            shift; break;;
+		*) error "Arguments parsing error"; exit 1;;
+	esac
+done
+
+[[ "$HELP" == 1 ]] && { usage; exit 0; }
+
+verbose "Command line arguments: ${GLOBAL_ARGS[@]}"
+
+# the remaining args are the features
+FEATURES="$@"
+
+# validate the machine
+debug "validating machine $MACHINE"
+find_machine_dir $MACHINE >/dev/null || error "Machine '$MACHINE' not found in [ $(list_all_machines)]"
+
+# validate the features
+for f in $FEATURES; do
+	debug "validating feature $f"
+	find_feature_dir $f >/dev/null || error "Feature '$f' not found in [ $(list_all_features)]"
+done
+
+# validate build dir
+debug "validating builddir $BUILDDIR"
+BUILDDIR=$(mkdir -p $BUILDDIR && cd $BUILDDIR && pwd -P)
+
+###########################################################################################
+function dump_log() {
+	info "    ------------ $(basename $1) -----------------"
+	sed 's/^/   | /g' $1
+	info "    ----------------------------------------"
+}
+
+function genconfig() {
+	info "Generating configuration files:"
+	info "   Build dir: $BUILDDIR"
+	info "   Machine: $MACHINE"
+	info "   Features: $FEATURES"
+
+	# step 1: run usual OE setup to generate conf dir
+	export TEMPLATECONF=$(cd $SCRIPTDIR/../templates/base && pwd -P)
+	debug "running oe-init-build-env with TEMPLATECONF=$TEMPLATECONF"
+	info "   Running $METADIR/poky/oe-init-build-env"
+	info "   Templates dir: $TEMPLATECONF"
+
+	CURDIR=$(pwd -P)
+	. $METADIR/poky/oe-init-build-env $BUILDDIR >/dev/null
+	cd $CURDIR
+
+	# step 2: concatenate other remaining fragments coming from base
+	process_fragments $TEMPLATECONF
+
+	# step 3: fragments for machine
+	process_fragments $(find_machine_dir $MACHINE)
+
+	# step 4: fragments for features
+	for feature in $FEATURES; do
+		process_fragments $(find_feature_dir $feature)
+	done
+
+	# step 5: sort fragments and append them in destination files
+	FRAGMENTS_BBLAYERS=$(sed 's/ /\n/g' <<<$FRAGMENTS_BBLAYERS | sort)
+	debug "bblayer fragments: $FRAGMENTS_BBLAYERS"
+	info "   Config: $BUILDDIR/conf/bblayers.conf"
+	for x in $FRAGMENTS_BBLAYERS; do
+		file=${x/#*:/}
+		append_fragment $BUILDDIR/conf/bblayers.conf $file
+		verbose "      + $file"
+	done
+
+	FRAGMENTS_LOCALCONF=$(sed 's/ /\n/g' <<<$FRAGMENTS_LOCALCONF | sort)
+	debug "localconf fragments: $FRAGMENTS_LOCALCONF"
+	info "   Config: $BUILDDIR/conf/local.conf"
+	for x in $FRAGMENTS_LOCALCONF; do
+		file=${x/#*:/}
+		append_fragment $BUILDDIR/conf/local.conf $file
+		verbose "      + $file"
+	done
+
+	FRAGMENTS_SETUP=$(sed 's/ /\n/g' <<<$FRAGMENTS_SETUP | sort)
+	debug "setup fragments: $FRAGMENTS_SETUP"
+	cat <<EOF >$BUILDDIR/conf/setup.sh
+#!/bin/bash
+
+# this script has been generated by $BASH_SOURCE
+
+export MACHINE="$MACHINE"
+export FEATURES="$FEATURES"
+export BUILDDIR="$BUILDDIR"
+export METADIR="$METADIR"
+
+echo "--- beginning of setup script"
+EOF
+	info "   Setup script: $BUILDDIR/conf/setup.sh"
+	for x in $FRAGMENTS_SETUP; do
+		file=${x/#*:/}
+		append_fragment $BUILDDIR/conf/setup.sh $file "echo '--- fragment $file'"
+		verbose "      + $file"
+	done
+	append_fragment $BUILDDIR/conf/setup.sh "" "echo '--- end of setup script'"
+
+	infon "   Executing setup script ... "
+	execute_setup $BUILDDIR/conf/setup.sh >$BUILDDIR/conf/setup.log 2>&1 \
+		&& { 
+			info "OK"
+			[[ $VERBOSE == 1 ]] && dump_log $BUILDDIR/conf/setup.log
+			rm $BUILDDIR/conf/setup.sh
+		} \
+		|| { 
+			info "FAIL: please check $BUILDDIR/conf/setup.log"
+			dump_log $BUILDDIR/conf/setup.log
+			return 1
+		}
+	# NOTE: the setup.sh script is removed if execution succeeded (only the log remains)
+}
+
+###########################################################################################
+
+# check for overwrite
+[[ $FORCE -eq 1 ]] && rm -f \
+	$BUILDDIR/conf/local.conf \
+	$BUILDDIR/conf/bblayers.conf \
+	$BUILDDIR/conf/setup.* \
+	$BUILDDIR/conf/*.log
+
+if [[ -f $BUILDDIR/conf/local.conf || -f $BUILDDIR/conf/bblayers.conf ]]; then
+	info "Configuration files already exist:"
+	for x in $BUILDDIR/conf/local.conf $BUILDDIR/conf/bblayers.conf; do
+		[[ -f $x ]] && info "   - $x" 
+	done
+	info "Skipping configuration files generation."
+	info "Use option -f|--force to overwrite existing configuration."
+else
+	genconfig
+fi
+
+# always generate setup script in builddir: it can be sourced later manually without re-running the setup
+infon "Generating setup file: $BUILDDIR/agl-init-build-env ... "
+cat <<EOF >$BUILDDIR/agl-init-build-env
+. $METADIR/poky/oe-init-build-env $BUILDDIR
+if [ -n "\$DL_DIR" ]; then
+	BB_ENV_EXTRAWHITE="\$BB_ENV_EXTRAWHITE DL_DIR"
+fi
+if [ -n "\$SSTATE_DIR" ]; then
+	 BB_ENV_EXTRAWHITE="\$BB_ENV_EXTRAWHITE SSTATE_DIR" 
+fi
+export BB_ENV_EXTRAWHITE
+unset TEMPLATECONF
+EOF
+info "OK"
+
+# finally, generate output script if requested by caller
+if [[ -n "$SETUPSCRIPT" ]]; then
+	debug "generating setupscript in $SETUPSCRIPT"
+	cat <<EOF >$SETUPSCRIPT
+. $BUILDDIR/agl-init-build-env
+EOF
+fi
+
+info "------------ $SCRIPT: Done"
diff --git a/scripts/aglsetup.sh b/scripts/aglsetup.sh
new file mode 100644
index 000000000..b11a54196
--- /dev/null
+++ b/scripts/aglsetup.sh
@@ -0,0 +1,60 @@
+################################################################################
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Stéphane Desneux <sdx@iot.bzh>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+################################################################################
+
+# detect if this script is sourced: see http://stackoverflow.com/a/38128348/6255594
+SOURCED=0
+if [ -n "$ZSH_EVAL_CONTEXT" ]; then 
+	[[ $ZSH_EVAL_CONTEXT =~ :file$ ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $0) && pwd -P); }
+elif [ -n "$KSH_VERSION" ]; then
+	[[ "$(cd $(dirname -- $0) && pwd -P)/$(basename -- $0)" != "$(cd $(dirname -- ${.sh.file}) && pwd -P)/$(basename -- ${.sh.file})" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- ${.sh.file}) && pwd -P); }
+elif [ -n "$BASH_VERSION" ]; then
+	[[ $0 != "$BASH_SOURCE" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $BASH_SOURCE) && pwd -P); }
+fi
+
+if [ $SOURCED -ne 1 ]; then
+	unset SOURCED
+	unset SOURCEDIR
+    echo "Error: this script needs to be sourced in a supported shell" >&2
+    echo "Please check that the current shell is bash, zsh or ksh and run this script as '. $0 <args>'" >&2
+    return 1
+else
+	unset SOURCED
+	tmpfile=$(mktemp /tmp/aglsetup.XXXXXXXX)
+	$SOURCEDIR/.aglsetup_genconfig.bash -s $tmpfile "$@"
+	rc=$?
+	unset SOURCEDIR
+	if [ $rc -eq 0 ]; then
+		source $tmpfile
+		rc=$?
+	else
+		echo "Error: configuration files generation failed. Environment is not ready."
+	fi
+
+	rm -f $tmpfile
+	unset tmpfile
+	return $rc
+fi
+
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index 6be4d38e1..27b1de19a 100644
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -1,208 +1,83 @@
 #!/bin/bash
 
-find_and_ack_eula() {
-    # Handle EULA , if needed. This is a generic method to handle BSPs
-    # that might (or not) come with a EULA. If a machine has a EULA, we
-    # assume that its corresponding layers has conf/EULA/$MACHINE file
-    # with the EULA text, which we will display to the user and request
-    # for acceptance. If accepted, the variable ACCEPT_EULA_$MACHINE is
-    # set to 1 in local.conf, which can later be used by the BSP.
-    # If the env variable EULA_$MACHINE is set it is used by default,
-    # without prompting the user.
-    # FIXME: there is a potential issue if the same $MACHINE is set in more than one layer.. but we should assert that earlier
-    EULA=$(find $1 -print | grep "conf/eula/$MACHINE" | grep -v scripts | grep -v openembedded-core || true)
-    if [ -n "$EULA" ]; then
-        # remove '-' since we are constructing a bash variable name here
-        EULA_MACHINE="EULA_$(echo $MACHINE | sed 's/-//g')"
-        # NOTE: indirect reference / dynamic variable
-        if [ -n "${!EULA_MACHINE}" ]; then
-            # the EULA_$MACHINE variable is set in the environment, so we just configure
-            # ACCEPT_EULA_$MACHINE in local.conf
-            EULA_ACCEPT=${!EULA_MACHINE}
-        else
-            # so we need to ask user if he/she accepts the EULA:
-            cat <<EOF
-The BSP for $MACHINE depends on packages and firmware which are covered by an 
-End User License Agreement (EULA). To have the right to use these binaries
-in your images, you need to read and accept the following...
-
-The firmware package can contains several types
-of firmware (depending on BSP):
-
-* bootloaders: the first stage bootloaders are proprietary for this
-  board, they are included in this firmware package.
-* firmware for the power management 'companion' core: on QCOM SoC some
-  power management features are implemented in a companion core , called
-  RPM, and not on the main CPU.
-* firmware for GPU, WLAN, DSP/GPS and video codecs. These firmware are
-  used by their respective linux drivers (DRM, wlan, v4l2, .. ) and are
-  loaded on-demand by the main CPU onto the various cores on the SoC.
-EOF
-
-            echo
-            REPLY=
-            while [ -z "$REPLY" ]; do
-                echo -n "Do you read the EULA ? (y/n) "
-                read REPLY
-                case "$REPLY" in
-                    y|Y)
-                        READ_EULA=1
-                        ;;
-                    n|N)
-                        READ_EULA=0
-                        ;;
-                    *)
-                        REPLY=
-                        ;;
-                esac
-            done
-
-            if [ "$READ_EULA" == 1 ]; then
-                more -d ${EULA}
-                echo
-                REPLY=
-                while [ -z "$REPLY" ]; do
-                    echo -n "Do you accept the EULA you just read? (y/n) "
-                    read REPLY
-                    case "$REPLY" in
-                        y|Y)
-                            echo "EULA has been accepted."
-                            EULA_ACCEPT=1
-                            ;;
-                        n|N)
-                            echo "EULA has not been accepted."
-                            ;;
-                        *)
-                            REPLY=
-                            ;;
-                    esac
-                done
-            fi
-        fi
-    fi
-}
-
-if [ -z $1 ]; then
-        echo -e "Usage: source envsetup.sh <board/device> [build dir]"
-        return 1
-fi
-
-MACHINE="$1"
-echo "MACHINE=$MACHINE"
-
-EULA_ACCEPT=0
-
-case "$MACHINE" in
-        "porter")
-                # setup proprietary gfx drivers and multimedia packages
-                COPY_MM_SCRIPT=meta-renesas/meta-rcar-gen2/scripts/setup_mm_packages.sh
-                if [ -f $COPY_MM_SCRIPT ]; then
-                        . $COPY_MM_SCRIPT
-                        copy_mm_packages $1
-                        if [ $? -ne 0 ]; then
-                                echo "Copying gfx drivers and multimedia packages for '$1' failed."
-                                return 1
-                        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"
-                fi
-                ;;
-        "raspberrypi3")
-                ;;
-        "raspberrypi2")
-                ;;
-        "intel-corei7-64")
-                ;;
-        "minnowboard")
-                # alias for minnowboardmax
-                MACHINE="intel-corei7-64"
-                ;;
-        "qemux86")
-                ;;
-        "qemux86-64")
-                ;;
-        "dra7xx-evm")
-                ;;
-        "vayu")
-                # nickname for dra7xx-evm
-                MACHINE="dra7xx-evm"
-                ;;
-        "wandboard")
-                ;;
-        "dragonboard-410c")
-                find_and_ack_eula meta-qcom
-                ;;
-        *)
-                # nothing to do here
-                echo "WARN: '$MACHINE' is not tested by AGL Distro"
-                ;;
-esac
-
-echo "TEMPALTECONF=$TEMPLATECONF"
-# set template conf for each <board/device>
-if [ -z "$TEMPLATECONF" ]; then
-    # lookup meta-agl-demo first
-    if [ -d "$PWD/meta-agl-demo/templates/$MACHINE/conf" ]; then
-        TEMPLATECONF="$PWD/meta-agl-demo/templates/$MACHINE/conf"
-    # lookup meta-agl 2nd
-    elif [ -d "$PWD/meta-agl/templates/$MACHINE/conf" ]; then
-        TEMPLATECONF="$PWD/meta-agl/templates/$MACHINE/conf"
-    fi
-fi
-echo "TEMPLATECONF=$TEMPLATECONF"
-
-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"
+################################################################################
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Stéphane Desneux <sdx@iot.bzh>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+################################################################################
+
+#################################################################################
+#                              IMPORTANT NOTICE
+#
+# This script is a compatiblity script with previous (AGL 1.0) envsetup script
+# It has been replaced by another script named "aglsetup.sh".
+# 
+################################################################################
+
+# detect if this script is sourced: see http://stackoverflow.com/a/38128348/6255594
+SOURCED=0
+if [ -n "$ZSH_EVAL_CONTEXT" ]; then 
+	[[ $ZSH_EVAL_CONTEXT =~ :file$ ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $0) && pwd -P); }
+elif [ -n "$KSH_VERSION" ]; then
+	[[ "$(cd $(dirname -- $0) && pwd -P)/$(basename -- $0)" != "$(cd $(dirname -- ${.sh.file}) && pwd -P)/$(basename -- ${.sh.file})" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- ${.sh.file}) && pwd -P); }
+elif [ -n "$BASH_VERSION" ]; then
+	[[ $0 != "$BASH_SOURCE" ]] && { SOURCED=1; SOURCEDIR=$(cd $(dirname -- $BASH_SOURCE) && pwd -P); }
 fi
 
-echo "envsetup: Using templates for local.conf & bblayers.conf from :"
-echo "          '$TEMPLATECONF'"
-export TEMPLATECONF
-
-if [ -n "$2" ]; then
-  BUILD_DIR="$2"
+if [ $SOURCED -ne 1 ]; then
+	unset SOURCED
+	unset SOURCEDIR
+	echo "Error: this script needs to be sourced in a supported shell" >&2
+	echo "Please check that the current shell is bash, zsh or ksh and run this script as '. $0 <args>'" >&2
+	return 1
 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
-
-if [ -n "$SSTATE_DIR" ]; then
-        BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE SSTATE_DIR"
+	unset SOURCED
+	if [ -z $1 ]; then
+        echo -e "Usage: source envsetup.sh <board/device> [build dir]"
+        return 1
+	fi
+	if [ -n "$2" ]; then
+		BUILD_DIR="$2"
+	else
+		BUILD_DIR=build
+	fi
+	# echo "DEPRECATED..." | figlet -f big -w 80 -c
+	cat <<'EOF' >&2
+ ------------------------------------------------------------------------------
+| using this script is...                                                      |
+|   _____  ______ _____  _____  ______ _____       _______ ______ _____        |
+|  |  __ \|  ____|  __ \|  __ \|  ____/ ____|   /\|__   __|  ____|  __ \       |
+|  | |  | | |__  | |__) | |__) | |__ | |       /  \  | |  | |__  | |  | |      |
+|  | |  | |  __| |  ___/|  _  /|  __|| |      / /\ \ | |  |  __| | |  | |      |
+|  | |__| | |____| |    | | \ \| |___| |____ / ____ \| |  | |____| |__| | _ _  |
+|  |_____/|______|_|    |_|  \_\______\_____/_/    \_\_|  |______|_____(_|_|_) |
+|                                                                              |
+| To support the newest/upcoming features, please use the script aglsetup.sh.  |
+ ------------------------------------------------------------------------------
+EOF
+	. $SOURCEDIR/aglsetup.sh -m $1 -b $BUILD_DIR agl-devel agl-netboot agl-appfw-smack agl-demo
+	rc=$?
+	unset SOURCEDIR
+	unset BUILD_DIR
+	return $rc
 fi
-
-export BB_ENV_EXTRAWHITE
-
-unset TEMPLATECONF
-
-case "$EULA_ACCEPT" in
-    1)
-        echo "" >> conf/local.conf
-        echo "# EULA" >> conf/local.conf
-        echo "ACCEPT_EULA_$MACHINE = \"1\"" >> conf/local.conf
-        ;;
-    *)
-        ;;
-esac