From 4d610e9f230dd23589b18588446c2368f3a99446 Mon Sep 17 00:00:00 2001
From: Anton Gerasimov <anton@advancedtelematic.com>
Date: Tue, 25 Apr 2017 15:21:07 +0200
Subject: Replace includes with bblcasses

They are more flexible and allow tricks like conditionally inheriting
machine-related classes from the main one which makes things easier
for external users like AGL
---
 scripts/envsetup.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index 6c01d5b..5adf319 100755
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -35,11 +35,6 @@ fi
 SCRIPTDIR=$(cd $(dirname $BASH_SOURCE) && pwd -P)
 METADIR=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P)
 
-if ! [[ -e ${SCRIPTDIR}/../conf/include/local/sota_${MACHINE}.inc && -e ${SCRIPTDIR}/../conf/include/bblayers/sota_${MACHINE}.inc ]]; then
-	echo "Error: invalid machine: ${MACHINE}" >&2
-	return -1
-fi
-
 if [ -e ${BUILDDIR}/conf/local.conf ]; then
 	source $METADIR/poky/oe-init-build-env ${BUILDDIR}
 else
@@ -47,8 +42,7 @@ else
 	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
-	echo "include conf/include/local/sota_${MACHINE}.inc" >> conf/local.conf
-	echo "include conf/distro/sota.conf.inc" >> conf/local.conf
+	echo "MACHINE = \"${MACHINE}\"" >> conf/local.conf
 	echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf
 fi
 
-- 
cgit v1.2.3-54-g00ecf