From 6c7560604612a4a9826c09d05fb6ea266fc4e2fc Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Mon, 29 Sep 2014 13:51:20 +0300
Subject: Use device specific bblayers.conf files

Intead of modifying one commong bblayers.conf.sample file, create separate
configs for each device type that uses different set of meta layers.

Unknown devices now use all meta layers by default.

Change-Id: I2bbcf803951c0c8c787b789420c325166b2ebbd5
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 scripts/setup_environment.sh | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

(limited to 'scripts')

diff --git a/scripts/setup_environment.sh b/scripts/setup_environment.sh
index 63f59cf..aaba070 100755
--- a/scripts/setup_environment.sh
+++ b/scripts/setup_environment.sh
@@ -27,8 +27,8 @@ usage() {
 
 clean() {
   unset BUILDDIR
-  unset NEWBUILD
   unset TEMPLATECONF
+  unset LAYERSCONF
 }
 
 CWD=`pwd`
@@ -57,42 +57,37 @@ if [ -z "$MACHINE" ]; then
   return 1
 fi
 
-if [ ! -d ${CWD}/${BUILDDIR} ]; then
-  NEWBUILD=1
-fi
-
-export TEMPLATECONF=${CWD}/sources/meta-b2qt/conf
-cd sources/poky
-. ./oe-init-build-env ${CWD}/${BUILDDIR}
-
-if [ -n "${NEWBUILD}" ]; then
+if [ ! -f ${CWD}/${BUILDDIR}/conf/bblayers.conf ]; then
   case ${MACHINE} in
     apalis-imx6)
-      LAYERS="meta-raspberrypi meta-beagleboard meta-ti"
+      LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
     imx53qsb|imx6qsabresd|nitrogen6x)
-      LAYERS="meta-raspberrypi meta-beagleboard meta-toradex meta-ti"
+      LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     beagleboard|am335x-evm)
-      LAYERS="meta-raspberrypi meta-beagleboard meta-toradex meta-fsl"
+      LAYERSCONF="bblayers.conf.ti.sample"
     ;;
     beaglebone)
-      LAYERS="meta-raspberrypi meta-toradex meta-fsl"
+      LAYERSCONF="bblayers.conf.bbb.sample"
     ;;
     raspberrypi)
-      LAYERS="meta-beagleboard meta-toradex meta-ti meta-fsl"
+      LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
     emulator)
-      LAYERS="meta-raspberrypi meta-beagleboard meta-toradex meta-ti meta-fsl"
+      LAYERSCONF="bblayers.conf.emulator.sample"
     ;;
     *)
-      echo "Unknown MACHINE, bblayer.conf might need manual editing"
+      LAYERSCONF="bblayers.conf.sample"
+      echo "Unknown MACHINE, bblayers.conf might need manual editing"
     ;;
   esac
 
-  for layer in ${LAYERS}; do
-    sed -i -e "/${layer}/d" conf/bblayers.conf
-  done
+  mkdir -p ${CWD}/${BUILDDIR}/conf
+  cp ${CWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${CWD}/${BUILDDIR}/conf/bblayers.conf
 fi
 
+export TEMPLATECONF=${CWD}/sources/meta-b2qt/conf
+cd sources/poky
+. ./oe-init-build-env ${CWD}/${BUILDDIR}
 clean
-- 
cgit v1.2.3-54-g00ecf