From d04f0793f5e06e23268a6025632bfd7abd113fb5 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Wed, 5 Jun 2019 16:06:59 +0200
Subject: Changes to support the repo clone rework
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To be merged together with:
https://gerrit.automotivelinux.org/gerrit/#/c/AGL/AGL-repo/+/21389/

v2: fix the aglsetup script
v3: fix scripts to extract m3ulcb
v4: use single folder for BSPs

Bug-AGL: SPEC-2450

Change-Id: I3227896c68ec1413f55cf67ad8f15a7adfe87a52
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 templates/base/bblayers.conf.sample | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'templates/base')

diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample
index 97537f490..653f6dbe8 100644
--- a/templates/base/bblayers.conf.sample
+++ b/templates/base/bblayers.conf.sample
@@ -8,16 +8,16 @@ BBFILES ?= ""
 # Convenience variables usable in various configuration fragments
 #----------------------------------
 BCONFDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)))}"
-METADIR  := "${@os.path.abspath('##OEROOT##/..')}"
+METADIR  := "${@os.path.abspath('##OEROOT##/../..')}"
 
 # These are the core OE + YP Layers
 #----------------------------------
 YOCTO_LAYERS = " \
-  ${METADIR}/poky/meta \
-  ${METADIR}/poky/meta-poky \
+  ${METADIR}/external/poky/meta \
+  ${METADIR}/external/poky/meta-poky \
   "
 #  this is added for the boards where necessary, not globally
-#  ${METADIR}/poky/meta-yocto-bsp \
+#  ${METADIR}/external/poky/meta-yocto-bsp \
 #
 # These are the AGL CORE Layers that make up the basis
 # - they create a minimal bootable filesystem
@@ -30,8 +30,8 @@ AGL_CORE_LAYERS = " \
   "
 
 AGL_APPFW_LAYERS = " \
-  ${METADIR}/meta-security \
-  ${METADIR}/meta-openembedded/meta-perl \
+  ${METADIR}/external/meta-security \
+  ${METADIR}/external/meta-openembedded/meta-perl \
   ${METADIR}/meta-agl/meta-security \
   ${METADIR}/meta-agl/meta-app-framework \
     "
@@ -40,11 +40,11 @@ AGL_APPFW_LAYERS = " \
 # These are the direct dependencies of the AGL CORE Layers
 #---------------------------------------------------------
 AGL_CORE_DEPENDENCY_LAYERS = " \
-  ${METADIR}/meta-openembedded/meta-oe \
-  ${METADIR}/meta-openembedded/meta-multimedia \
-  ${METADIR}/meta-openembedded/meta-networking \
-  ${METADIR}/meta-openembedded/meta-python \
-  ${METADIR}/meta-openembedded/meta-filesystems \
+  ${METADIR}/external/meta-openembedded/meta-oe \
+  ${METADIR}/external/meta-openembedded/meta-multimedia \
+  ${METADIR}/external/meta-openembedded/meta-networking \
+  ${METADIR}/external/meta-openembedded/meta-python \
+  ${METADIR}/external/meta-openembedded/meta-filesystems \
   "
 
 ####################
@@ -57,8 +57,8 @@ BBLAYERS ?= " \
   "
 
 BBLAYERS_NON_REMOVABLE ?= " \
-  ${METADIR}/poky/meta \
-  ${METADIR}/poky/meta-poky \
+  ${METADIR}/external/poky/meta \
+  ${METADIR}/external/poky/meta-poky \
   ${METADIR}/meta-agl/meta-agl-profile-core \
   ${METADIR}/meta-agl/meta-agl-distro \
   "
-- 
cgit 1.2.3-korg