aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--templates/base/bblayers.conf.sample10
-rw-r--r--templates/feature/agl-appfw-smack/50_bblayers.conf.inc9
-rw-r--r--templates/feature/agl-netboot/50_bblayers.conf.inc5
3 files changed, 21 insertions, 3 deletions
diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample
index 0dd28da03..82ab42d67 100644
--- a/templates/base/bblayers.conf.sample
+++ b/templates/base/bblayers.conf.sample
@@ -35,9 +35,19 @@ AGL_CORE_DEPENDENCY_LAYERS = " \
${METADIR}/external/meta-openembedded/meta-oe \
"
+# Indirection to avoid duplicate inclusions of the same folder into BBLAYERS
+# the evaluation is in the bblayers.conf.sample in meta-agl/templates/base
+AGL_META_NETWORKING ?= ""
+AGL_META_PYTHON ?= ""
+AGL_OTHER_DEPENDENCY_LAYERS = " \
+ ${AGL_META_NETWORKING} \
+ ${AGL_META_PYTHON} \
+ "
+
####################
# Combine the layers
BBLAYERS ?= " \
+ ${AGL_OTHER_DEPENDENCY_LAYERS} \
${AGL_CORE_DEPENDENCY_LAYERS} \
${AGL_CORE_LAYERS} \
${YOCTO_LAYERS} \
diff --git a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc b/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
index 5f6847a87..2e79797e8 100644
--- a/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
+++ b/templates/feature/agl-appfw-smack/50_bblayers.conf.inc
@@ -1,9 +1,12 @@
AGL_APPFW_LAYERS = " \
${METADIR}/external/meta-security \
- ${METADIR}/external/meta-openembedded/meta-python \
- ${METADIR}/external/meta-openembedded/meta-networking \
${METADIR}/external/meta-openembedded/meta-perl \
${METADIR}/meta-agl/meta-app-framework \
"
-BBLAYERS =+ "${AGL_APPFW_LAYERS}" \ No newline at end of file
+BBLAYERS =+ "${AGL_APPFW_LAYERS}"
+
+# Indirection to avoid duplicate inclusions of the same folder into BBLAYERS
+# the evaluation is in the bblayers.conf.sample in meta-agl/templates/base
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
diff --git a/templates/feature/agl-netboot/50_bblayers.conf.inc b/templates/feature/agl-netboot/50_bblayers.conf.inc
index 80ace82d4..7cbff1662 100644
--- a/templates/feature/agl-netboot/50_bblayers.conf.inc
+++ b/templates/feature/agl-netboot/50_bblayers.conf.inc
@@ -1,2 +1,7 @@
BBLAYERS =+ " ${METADIR}/meta-agl/meta-netboot \
"
+
+# Indirection to avoid duplicate inclusions of the same folder into BBLAYERS
+# the evaluation is in the bblayers.conf.sample in meta-agl/templates/base
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"