diff options
author | Ben Luck <ben+qa@advancedtelematic.com> | 2017-08-22 12:30:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-22 12:30:47 +0200 |
commit | 7cfed25eed722135ce9c7ab17a1076ec7989cab9 (patch) | |
tree | 8e127827aea2f9a39ce11ce4f6ac548fe16852da /scripts | |
parent | 8a0ef9f142555c553d714668c611eae3df9f7a89 (diff) | |
parent | b48fe3ed766250dac8564a0f6bd0b05988e35f5c (diff) | |
download | meta-updater-7cfed25eed722135ce9c7ab17a1076ec7989cab9.tar.gz |
Merge pull request #127 from leon-anavi/PRO-3776
scripts/envsetup.sh: Use machine specific local.conf
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/envsetup.sh | 10 |
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 | |||
24 | METADIR="${SOURCEDIR}/../.." | 24 | METADIR="${SOURCEDIR}/../.." |
25 | 25 | ||
26 | if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then | 26 | if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then |
27 | source "$METADIR/poky/oe-init-build-env" "$BUILDDIR" | 27 | if [ -z "$TEMPLATECONF" ] && [ -d ${METADIR}/meta-updater-${MACHINE}/conf ]; then |
28 | # Use the template configurations for the specified machine | ||
29 | TEMPLATECONF=${METADIR}/meta-updater-${MACHINE}/conf | ||
30 | source "$METADIR/poky/oe-init-build-env" "$BUILDDIR" | ||
31 | unset TEMPLATECONF | ||
32 | else | ||
33 | # Use the default configurations or TEMPLATECONF set by the user | ||
34 | source "$METADIR/poky/oe-init-build-env" "$BUILDDIR" | ||
35 | fi | ||
28 | echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf | 36 | echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf |
29 | cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf | 37 | 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 | 38 | cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf |