Merge pull request #133 from advancedtelematic/merge-morty-changes-forward

Merge morty changes forward to pyro

1 files changed, 9 insertions, 1 deletions

diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index ff78681..260b048 100755
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -24,7 +24,15 @@ fi
 METADIR="${SOURCEDIR}/../.."
 
 if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then
-  source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
+  if [ -z "$TEMPLATECONF" ] && [ -d ${METADIR}/meta-updater-${MACHINE}/conf ]; then
+    # Use the template configurations for the specified machine
+    TEMPLATECONF=${METADIR}/meta-updater-${MACHINE}/conf
+    source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
+    unset TEMPLATECONF
+  else
+    # Use the default configurations or TEMPLATECONF set by the user
+    source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
+  fi
   echo "METADIR  := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf
   cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf
   cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf