Hybrid configuration support for agl-lxc and agl-virt

In previous implementation for agl-lxc, meta-virtualization is import
using agl-virt feature. It' controlled by included.dep.
The patch of
https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-devel/+/26482
change import method from using agl-virt  to directly.

When that patch apply only, we can't use hybrid configuration for
agl-lxc and agl-virt.  This patch fix this issue.

Bug-AGL: SPEC-4014

Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Change-Id: I9455c9eca44a01793bfc8d95ac1f8cdefd24de77
Signed-off-by: Naoto Yamaguchi <i33399_yamaguchi@aisin-aw.co.jp>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26486
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jenkins Job builder account

diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample
index 3a1eae6..f568062 100644 (file)
--- a/templates/base/bblayers.conf.sample
+++ b/templates/base/bblayers.conf.sample
@@ -40,10 +40,12 @@ AGL_CORE_DEPENDENCY_LAYERS = " \
 AGL_META_NETWORKING ?= ""
 AGL_META_PYTHON ?= ""
 AGL_META_FILESYSTEMS ?= ""
+AGL_META_VIRTUALIZATION ?= ""
 AGL_OTHER_DEPENDENCY_LAYERS = " \
     ${AGL_META_NETWORKING} \
     ${AGL_META_PYTHON} \
     ${AGL_META_FILESYSTEMS} \
+    ${AGL_META_VIRTUALIZATION} \
     "
 
 ####################

diff --git a/templates/feature/agl-virt/50_bblayers.conf.inc b/templates/feature/agl-virt/50_bblayers.conf.inc
index 217d4aa..65dc195 100644 (file)
--- a/templates/feature/agl-virt/50_bblayers.conf.inc
+++ b/templates/feature/agl-virt/50_bblayers.conf.inc
@@ -1,7 +1,5 @@
 AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
 AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
 AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems"
+AGL_META_VIRTUALIZATION = "${METADIR}/external/meta-virtualization"
 
-BBLAYERS =+ " \
-       ${METADIR}/external/meta-virtualization \
-       "