Fix new/existing build directory logic

1 files changed, 3 insertions, 1 deletions

diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index c2f27c5..ff78681 100755
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -22,12 +22,14 @@ if [[ $SOURCED -ne 1 ]]; then
 fi
 
 METADIR="${SOURCEDIR}/../.."
-source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
 
 if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then
+  source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
   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
   echo "MACHINE = \"${MACHINE}\"" >> conf/local.conf
   echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf
+else
+  source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
 fi