env files: Simplify

We don't need anymore the DISTRO_TYPE, DISTRO_OSTREE and MACHINE_TYPE.

Also the "set -a" was causing troubles after sourcing the script in ZSH
and doing copy-pastes. Therefore we just export the required variables.

env.common

@@ -1,18 +1,15 @@
-set -a # exports all variables
-
-# exporting DISTRO*
-DISTRO_OSTREE=$DISTRO_OSTREE
-DISTRO_TYPE=$DISTRO_TYPE
-DISTRO=netmodule-linux$DISTRO_OSTREE$DISTRO_TYPE
+if [ -z "$DISTRO" ]; then
+    echo "No distro selected. Please source a helper script (env.*)"
+fi
 
 if [ -z "$MACHINE" ]; then
     . ./machine_select
 fi
 
-MACHINE_TYPE=$(echo $MACHINE | rev | cut -f2- -d- | rev)
-
 echo Building for machine $MACHINE, distro: $DISTRO
 
-OSTREE_OSNAME=nm-linux
+export DISTRO
+export MACHINE
+export OSTREE_OSNAME=nm-linux
 
 . ./openembedded-core/oe-init-build-env build$BUILD_FOLDER_APPEND

env.image

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

env.image-fct

@@ -1,5 +1,3 @@
-DISTRO_OSTREE=""
-DISTRO_TYPE="-fct"
-BUILD_FOLDER_APPEND=$DISTRO_TYPE
-
+DISTRO="netmodule-linux-fct"
+BUILD_FOLDER_APPEND="-fct"
 . ./env.common

env.image-lava

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

env.image-minimal

@@ -1,5 +1,3 @@
-DISTRO_OSTREE=""
-DISTRO_TYPE="-minimal"
-BUILD_FOLDER_APPEND=$DISTRO_TYPE
-
+DISTRO="netmodule-linux-minimal"
+BUILD_FOLDER_APPEND="-minimal"
 . ./env.common

env.image-ostree

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

env.image-vcu

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

machine_select

@@ -13,7 +13,6 @@ HW24="nrhw24 - NB800 facelift"
 HW25="hw25 - TC Router"
 HW26="hw26 - NG800"
 
-set -a
 select opt in HW16 HW18 HW20 HW21 HW23 DLM HW24 HW25 HW26
 do
     case $opt in
@@ -58,3 +57,4 @@ do
 done
 
 echo $MACHINE
+export MACHINE