diff options
| author |   Naoto Yamaguchi <i33399_yamaguchi@aisin-aw.co.jp> | 2021-07-07 05:57:06 +0000 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-07-13 21:15:54 +0000 |
| commit | 00488a311c18f03bf7a30b244fcd373c8c30c42e (patch) | |
| tree | f0e1a71e7b3b7704ad379fdbd9fa80ca51b4e6f3 | |
| parent | bc4666c43c67a666e1cf6706b601b397fd0f5548 (diff) | |
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
| -rw-r--r-- | templates/base/bblayers.conf.sample | 2 | ||||
| -rw-r--r-- | templates/feature/agl-virt/50_bblayers.conf.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/base/bblayers.conf.sample b/templates/base/bblayers.conf.sample index 3a1eae676..f5680622c 100644 --- 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 217d4aafd..65dc19580 100644 --- 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 \ - " |