From 00488a311c18f03bf7a30b244fcd373c8c30c42e Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Wed, 7 Jul 2021 05:57:06 +0000 Subject: 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 Change-Id: I9455c9eca44a01793bfc8d95ac1f8cdefd24de77 Signed-off-by: Naoto Yamaguchi Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26486 Reviewed-by: Jan-Simon Moeller Tested-by: Jenkins Job builder account --- templates/base/bblayers.conf.sample | 2 ++ 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 \ - " -- cgit 1.2.3-korg