summaryrefslogtreecommitdiffstats
path: root/scripts/envsetup.sh
diff options
context:
space:
mode:
authorOYTIS <tossel@gmail.com>2017-11-17 12:17:24 +0100
committerGitHub <noreply@github.com>2017-11-17 12:17:24 +0100
commit3d5e35d7a1afc604a18587cb736a66c0cc9c3977 (patch)
tree0d0644c10856b2035728da2e8e08e0b8a09b5f04 /scripts/envsetup.sh
parentd81696e8320ac7927467c681a370e6700ee681b1 (diff)
parente31b5428a4dff2b5d68daf34f079c4789c0c5d4b (diff)
downloadmeta-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/envsetup.sh')
-rwxr-xr-xscripts/envsetup.sh10
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
24METADIR="${SOURCEDIR}/../.." 24METADIR="${SOURCEDIR}/../.."
25 25
26if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then 26if [[ ! -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