Improve environment files

With this changes it is possible to source from anywhere a machine or
distro file.

It is also cleaning all the environment files in the main directory.

As example, to load environment for HW21 and lava image for example the
following command can be used:

. env/distro/lava-image && . ../env/machine/hw21

env.common

@@ -1,15 +0,0 @@
-if [ -z "$DISTRO" ]; then
-    echo "No distro selected. Please source a helper script (env.*)"
-fi
-
-if [ -z "$MACHINE" ]; then
-    . ./machine_select
-fi
-
-echo Building for machine $MACHINE, distro: $DISTRO
-
-export DISTRO
-export MACHINE
-export OSTREE_OSNAME=nm-linux
-
-. ./openembedded-core/oe-init-build-env build$BUILD_FOLDER_APPEND

env.image

@@ -1,3 +0,0 @@
-DISTRO="netmodule-linux"
-BUILD_FOLDER_APPEND=""
-. ./env.common

env.image-fct

@@ -1,3 +0,0 @@
-DISTRO="netmodule-linux-fct"
-BUILD_FOLDER_APPEND="-fct"
-. ./env.common

env.image-lava

@@ -1,3 +0,0 @@
-DISTRO="netmodule-linux-lava"
-BUILD_FOLDER_APPEND="-fct"
-. ./env.common

env.image-ostree

@@ -1,3 +0,0 @@
-DISTRO="netmodule-linux-ostree"
-BUILD_FOLDER_APPEND=""
-. ./env.common

env.image-vcu

@@ -1,3 +0,0 @@
-DISTRO="netmodule-linux-ostree-vcu"
-BUILD_FOLDER_APPEND=""
-. ./env.common

env/common

@@ -0,0 +1,24 @@
+if [ -z "$DISTRO" ]; then
+    echo "No distro selected. Please source a helper script (env/distro/*)"
+    return
+fi
+
+if [ -z "$MACHINE" ]; then
+    echo "No machine selected. Please source a helper script (env/machine/*)"
+    return
+fi
+
+echo
+echo Build parameters:
+printf "\tMACHINE = $MACHINE\n"
+printf "\tDISTRO = $DISTRO\n"
+echo
+
+export DISTRO
+export MACHINE
+export OSTREE_OSNAME=nm-linux
+
+# Moving back to top yocto directory (env/..)
+env_path=${BASH_SOURCE:-$0}
+cd $(dirname $env_path)/..
+source openembedded-core/oe-init-build-env build$BUILD_FOLDER_APPEND

env/distro/base-image

@@ -0,0 +1,4 @@
+DISTRO="netmodule-linux"
+BUILD_FOLDER_APPEND=""
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/distro/fct-image

@@ -0,0 +1,4 @@
+DISTRO="netmodule-linux-fct"
+BUILD_FOLDER_APPEND="-fct"
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/distro/lava-image

@@ -0,0 +1,4 @@
+DISTRO="netmodule-linux-lava"
+BUILD_FOLDER_APPEND="-fct"
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/distro/minimal-image

@@ -1,3 +1,4 @@
 DISTRO="netmodule-linux-minimal"
 BUILD_FOLDER_APPEND="-minimal"
-. ./env.common
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/distro/ostree-image

@@ -0,0 +1,4 @@
+DISTRO="netmodule-linux-ostree"
+BUILD_FOLDER_APPEND=""
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/distro/vcu-image

@@ -0,0 +1,4 @@
+DISTRO="netmodule-linux-ostree-vcu"
+BUILD_FOLDER_APPEND=""
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw16

@@ -0,0 +1,3 @@
+MACHINE=am335x-nrhw16
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw18

@@ -0,0 +1,3 @@
+MACHINE=armada-385-nrhw18
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw20

@@ -0,0 +1,3 @@
+MACHINE=am335x-nrhw20
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw21

@@ -0,0 +1,3 @@
+MACHINE=am335x-nmhw21
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw23

@@ -0,0 +1,3 @@
+MACHINE=imx8-nmhw23
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw24

@@ -0,0 +1,3 @@
+MACHINE=am335x-nmhw24
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw25

@@ -0,0 +1,3 @@
+MACHINE=am335x-hw25
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw26

@@ -0,0 +1,3 @@
+MACHINE=am335x-hw26
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common