summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPhil Wise <phil@advancedtelematic.com>2017-06-26 16:33:56 +0200
committerPhil Wise <phil@advancedtelematic.com>2017-06-26 16:33:56 +0200
commit0f40a9d48aeffeebccd01124f8e8c43b2e29883c (patch)
tree29976fc11edfa2c5c6680760e482034bfffa833d /scripts
parenta33124a4592820f4b3c4deaf6853476df2a2f105 (diff)
downloadmeta-updater-0f40a9d48aeffeebccd01124f8e8c43b2e29883c.tar.gz
Fix new/existing build directory logic
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/envsetup.sh4
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
22fi 22fi
23 23
24METADIR="${SOURCEDIR}/../.." 24METADIR="${SOURCEDIR}/../.."
25source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
26 25
27if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then 26if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then
27 source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
28 echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf 28 echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf
29 cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf 29 cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf
30 cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf 30 cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf
31 echo "MACHINE = \"${MACHINE}\"" >> conf/local.conf 31 echo "MACHINE = \"${MACHINE}\"" >> conf/local.conf
32 echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf 32 echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf
33else
34 source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
33fi 35fi