From 5b5fb2fb7b6b47535c8dedcaa43ef255c1118900 Mon Sep 17 00:00:00 2001
From: Anton Gerasimov <anton@advancedtelematic.com>
Date: Thu, 16 Nov 2017 18:03:36 +0100
Subject: Ignore configuration templates to avoid duplicate inclusion of stuff

Cherry-picked (e31b5428a4dff2b5d68daf34f079c4789c0c5d4b) from pyro, but
leaving out the IMAGE_ROOTFS_EXTRA_SPACE part.

This fixes a bug that was rather tough to track down. The duplicated
layer meant that the same patch for pseudo was getting applied twice,
which caused a loud error instead of just getting skipped.
---
 scripts/envsetup.sh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'scripts')

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
 METADIR="${SOURCEDIR}/../.."
 
 if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then
-  if [ -z "$TEMPLATECONF" ] && [ -d ${METADIR}/meta-updater-${MACHINE}/conf ]; then
-    # Use the template configurations for the specified machine
-    TEMPLATECONF=${METADIR}/meta-updater-${MACHINE}/conf
-    source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
-    unset TEMPLATECONF
-  else
-    # Use the default configurations or TEMPLATECONF set by the user
-    source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
-  fi
+  source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
   echo "METADIR  := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf
   cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf
   cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf
-- 
cgit v1.2.3-54-g00ecf