diff options
| author | OYTIS <tossel@gmail.com> | 2017-11-17 12:17:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 12:17:24 +0100 |
| commit | 3d5e35d7a1afc604a18587cb736a66c0cc9c3977 (patch) | |
| tree | 0d0644c10856b2035728da2e8e08e0b8a09b5f04 /scripts | |
| parent | d81696e8320ac7927467c681a370e6700ee681b1 (diff) | |
| parent | e31b5428a4dff2b5d68daf34f079c4789c0c5d4b (diff) | |
| download | meta-updater-3d5e35d7a1afc604a18587cb736a66c0cc9c3977.tar.gz | |
Merge pull request #181 from advancedtelematic/bugfix/PRO-4319/duplicate-bblayers-snippets
Ignore configuration templates to avoid duplicate inclusion of stuff
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/envsetup.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh index 260b048..ff78681 100755 --- a/scripts/envsetup.sh +++ b/scripts/envsetup.sh | |||
| @@ -24,15 +24,7 @@ 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 | if [ -z "$TEMPLATECONF" ] && [ -d ${METADIR}/meta-updater-${MACHINE}/conf ]; then | 27 | source "$METADIR/poky/oe-init-build-env" "$BUILDDIR" |
| 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 | ||
| 36 | echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf | 28 | echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf |
| 37 | 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 |
| 38 | 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 |