aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-06-10 19:25:13 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2019-06-10 19:25:13 +0000
commit7489fa14eee5819f8fd965c3f8f53e62ce7fcfd2 (patch)
tree1f6fff325d9377d2e6dd3e79252ff231d11bde6f /templates
parent9ab1047679978070b4c0647ec1c9f9846c179570 (diff)
parentd04f0793f5e06e23268a6025632bfd7abd113fb5 (diff)
Merge "Changes to support the repo clone rework"
Diffstat (limited to 'templates')
-rw-r--r--templates/base/bblayers.conf.sample26
-rw-r--r--templates/feature/agl-fossdriver/50_bblayers.conf.inc2
-rw-r--r--templates/feature/agl-gplv2/50_bblayers.conf.inc2
-rw-r--r--templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc2
-rw-r--r--templates/feature/agl-sota/50_bblayers.conf.inc8
-rw-r--r--templates/machine/beaglebone/50_bblayers.conf.inc2
-rw-r--r--templates/machine/cyclone5/50_bblayers.conf.inc2
-rw-r--r--templates/machine/dra7xx-evm/50_bblayers.conf.inc2
-rw-r--r--templates/machine/dragonboard-410c/50_bblayers.conf.inc4
-rw-r--r--templates/machine/dragonboard-820c/50_bblayers.conf.inc2
-rw-r--r--templates/machine/h3-salvator-x/50_bblayers.conf.inc2
-rw-r--r--templates/machine/h3ulcb/50_bblayers.conf.inc2
-rw-r--r--templates/machine/hsdk/40_bblayers.conf.inc2
-rw-r--r--templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc2
-rw-r--r--templates/machine/intel-corei7-64/50_bblayers.conf.inc2
-rw-r--r--templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc2
-rw-r--r--templates/machine/m3ulcb/50_bblayers.conf.inc2
-rw-r--r--templates/machine/raspberrypi3/50_bblayers.conf.inc2
18 files changed, 34 insertions, 34 deletions
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 \
"
diff --git a/templates/feature/agl-fossdriver/50_bblayers.conf.inc b/templates/feature/agl-fossdriver/50_bblayers.conf.inc
index f429f3961..eea04c4e8 100644
--- a/templates/feature/agl-fossdriver/50_bblayers.conf.inc
+++ b/templates/feature/agl-fossdriver/50_bblayers.conf.inc
@@ -1 +1 @@
-BBLAYERS =+ "${METADIR}/meta-spdxscanner"
+BBLAYERS =+ "${METADIR}/external/meta-spdxscanner"
diff --git a/templates/feature/agl-gplv2/50_bblayers.conf.inc b/templates/feature/agl-gplv2/50_bblayers.conf.inc
index 4c31c45c5..a0f26980d 100644
--- a/templates/feature/agl-gplv2/50_bblayers.conf.inc
+++ b/templates/feature/agl-gplv2/50_bblayers.conf.inc
@@ -1 +1 @@
-BBLAYERS =+ "${METADIR}/meta-gplv2"
+BBLAYERS =+ "${METADIR}/external/meta-gplv2"
diff --git a/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc b/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc
index b0ac5bf14..960267908 100644
--- a/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc
+++ b/templates/feature/agl-profile-graphical-qt5/50_bblayers.conf.inc
@@ -5,5 +5,5 @@ BBLAYERS =+ " \
# These are the dependencies
#---------------------------
BBLAYERS =+ " \
- ${METADIR}/meta-qt5 \
+ ${METADIR}/external/meta-qt5 \
"
diff --git a/templates/feature/agl-sota/50_bblayers.conf.inc b/templates/feature/agl-sota/50_bblayers.conf.inc
index 7510b45be..67c41d230 100644
--- a/templates/feature/agl-sota/50_bblayers.conf.inc
+++ b/templates/feature/agl-sota/50_bblayers.conf.inc
@@ -1,7 +1,7 @@
BBLAYERS =+ " \
- ${METADIR}/meta-updater \
- ${METADIR}/meta-updater-qemux86-64 \
- ${METADIR}/meta-openembedded/meta-filesystems \
- ${METADIR}/meta-openembedded/meta-python \
+ ${METADIR}/external/meta-updater \
+ ${METADIR}/external/meta-updater-qemux86-64 \
+ ${METADIR}/external/meta-openembedded/meta-filesystems \
+ ${METADIR}/external/meta-openembedded/meta-python \
"
diff --git a/templates/machine/beaglebone/50_bblayers.conf.inc b/templates/machine/beaglebone/50_bblayers.conf.inc
index c62a1bbb3..f116ca28b 100644
--- a/templates/machine/beaglebone/50_bblayers.conf.inc
+++ b/templates/machine/beaglebone/50_bblayers.conf.inc
@@ -1 +1 @@
-BBLAYERS =+ "${METADIR}/meta-ti"
+BBLAYERS =+ "${METADIR}/bsp/meta-ti"
diff --git a/templates/machine/cyclone5/50_bblayers.conf.inc b/templates/machine/cyclone5/50_bblayers.conf.inc
index fe60a267f..857d9f1d4 100644
--- a/templates/machine/cyclone5/50_bblayers.conf.inc
+++ b/templates/machine/cyclone5/50_bblayers.conf.inc
@@ -1 +1 @@
-BBLAYERS =+ "${METADIR}/meta-altera"
+BBLAYERS =+ "${METADIR}/bsp/meta-altera"
diff --git a/templates/machine/dra7xx-evm/50_bblayers.conf.inc b/templates/machine/dra7xx-evm/50_bblayers.conf.inc
index c62a1bbb3..f116ca28b 100644
--- a/templates/machine/dra7xx-evm/50_bblayers.conf.inc
+++ b/templates/machine/dra7xx-evm/50_bblayers.conf.inc
@@ -1 +1 @@
-BBLAYERS =+ "${METADIR}/meta-ti"
+BBLAYERS =+ "${METADIR}/bsp/meta-ti"
diff --git a/templates/machine/dragonboard-410c/50_bblayers.conf.inc b/templates/machine/dragonboard-410c/50_bblayers.conf.inc
index 62d02070a..4a3cae0f3 100644
--- a/templates/machine/dragonboard-410c/50_bblayers.conf.inc
+++ b/templates/machine/dragonboard-410c/50_bblayers.conf.inc
@@ -1,2 +1,2 @@
-BBLAYERS =+ "${METADIR}/meta-qcom"
-BBMASK .= "|meta-qcom/openembedded-layer/recipes-navigation/gpsd"
+BBLAYERS =+ "${METADIR}/bsp/meta-qcom"
+BBMASK .= "|bsp/meta-qcom/openembedded-layer/recipes-navigation/gpsd"
diff --git a/templates/machine/dragonboard-820c/50_bblayers.conf.inc b/templates/machine/dragonboard-820c/50_bblayers.conf.inc
index 01ffb7f17..f3b96cbb6 100644
--- a/templates/machine/dragonboard-820c/50_bblayers.conf.inc
+++ b/templates/machine/dragonboard-820c/50_bblayers.conf.inc
@@ -1 +1 @@
-BBLAYERS =+ "${METADIR}/meta-qcom"
+BBLAYERS =+ "${METADIR}/bsp/meta-qcom"
diff --git a/templates/machine/h3-salvator-x/50_bblayers.conf.inc b/templates/machine/h3-salvator-x/50_bblayers.conf.inc
index b58989c6f..7b0db440a 100644
--- a/templates/machine/h3-salvator-x/50_bblayers.conf.inc
+++ b/templates/machine/h3-salvator-x/50_bblayers.conf.inc
@@ -1,3 +1,3 @@
BBLAYERS =+ "\
- ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
"
diff --git a/templates/machine/h3ulcb/50_bblayers.conf.inc b/templates/machine/h3ulcb/50_bblayers.conf.inc
index ad672c999..5f410f0ff 100644
--- a/templates/machine/h3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/h3ulcb/50_bblayers.conf.inc
@@ -1,4 +1,4 @@
BBLAYERS =+ "\
- ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
"
diff --git a/templates/machine/hsdk/40_bblayers.conf.inc b/templates/machine/hsdk/40_bblayers.conf.inc
index 8c02e8f61..e3954fef3 100644
--- a/templates/machine/hsdk/40_bblayers.conf.inc
+++ b/templates/machine/hsdk/40_bblayers.conf.inc
@@ -1,2 +1,2 @@
# Use meta-synopsys layer for ARC HSDK board
-BBLAYERS =+ "${METADIR}/meta-synopsys"
+BBLAYERS =+ "${METADIR}/bsp/meta-synopsys"
diff --git a/templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc b/templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc
index 779006506..edcb6a3a2 100644
--- a/templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc
+++ b/templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc
@@ -1,5 +1,5 @@
# This must be parsed after qt5, etc. layers so that they are correctly
# recognized by meta-freescale/dynamic-layers
BBLAYERS =+ "\
- ${METADIR}/meta-freescale \
+ ${METADIR}/bsp/meta-freescale \
"
diff --git a/templates/machine/intel-corei7-64/50_bblayers.conf.inc b/templates/machine/intel-corei7-64/50_bblayers.conf.inc
index d50ccc922..8fd7af533 100644
--- a/templates/machine/intel-corei7-64/50_bblayers.conf.inc
+++ b/templates/machine/intel-corei7-64/50_bblayers.conf.inc
@@ -1 +1 @@
-BBLAYERS =+ "${METADIR}/meta-intel"
+BBLAYERS =+ "${METADIR}/bsp/meta-intel"
diff --git a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
index ad672c999..5f410f0ff 100644
--- a/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb-nogfx/50_bblayers.conf.inc
@@ -1,4 +1,4 @@
BBLAYERS =+ "\
- ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
"
diff --git a/templates/machine/m3ulcb/50_bblayers.conf.inc b/templates/machine/m3ulcb/50_bblayers.conf.inc
index ad672c999..5f410f0ff 100644
--- a/templates/machine/m3ulcb/50_bblayers.conf.inc
+++ b/templates/machine/m3ulcb/50_bblayers.conf.inc
@@ -1,4 +1,4 @@
BBLAYERS =+ "\
- ${METADIR}/meta-renesas-rcar-gen3/meta-rcar-gen3 \
+ ${METADIR}/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3 \
${METADIR}/meta-agl/meta-agl-bsp/meta-rcar-gen3-adas \
"
diff --git a/templates/machine/raspberrypi3/50_bblayers.conf.inc b/templates/machine/raspberrypi3/50_bblayers.conf.inc
index 1250b359f..2e677dd8a 100644
--- a/templates/machine/raspberrypi3/50_bblayers.conf.inc
+++ b/templates/machine/raspberrypi3/50_bblayers.conf.inc
@@ -1 +1 @@
-BBLAYERS =+ "${METADIR}/meta-raspberrypi"
+BBLAYERS =+ "${METADIR}/bsp/meta-raspberrypi"