diff options
| author | Phil Wise <phil@advancedtelematic.com> | 2017-08-24 17:12:36 +0200 |
|---|---|---|
| committer | Phil Wise <phil@advancedtelematic.com> | 2017-08-24 17:12:36 +0200 |
| commit | a130c026af9426eb657d04bfcd4402ad5be53cc7 (patch) | |
| tree | f8be0daedcf1cbc34d62f2c3721400707b309268 /scripts | |
| parent | f9432682932fe6fcca59289e40bfca5ceacb137c (diff) | |
| parent | 4e5064a1caae234a2ba755c246803d550234fd2b (diff) | |
| download | meta-updater-a130c026af9426eb657d04bfcd4402ad5be53cc7.tar.gz | |
Merge remote-tracking branch 'github/morty' into HEAD
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 |