From 0f40a9d48aeffeebccd01124f8e8c43b2e29883c Mon Sep 17 00:00:00 2001 From: Phil Wise Date: Mon, 26 Jun 2017 16:33:56 +0200 Subject: Fix new/existing build directory logic --- scripts/envsetup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3-54-g00ecf