aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorNaoto Yamaguchi <i33399_yamaguchi@aisin-aw.co.jp>2021-07-05 05:40:23 +0000
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-07-13 06:41:45 +0000
commit97d9a76cc73cec3ffadb9539cc76e56beaf8a9bc (patch)
tree21eb577c0ed473033ec0c22b81c957a019ca1f6c /templates
parent8be4ced7dd842564c9deaabaa90da75397a22c56 (diff)
Drop agl-virt dependency
The agl-lxc depend to only lxc from meta-virtualization. On the other hand, current setting depend to agl-virt to import meta-virtualization. In this case, the change of agl-virt propagate to agl-lxc, it's broken to quality assessment software stack. This patch drop to agl-virt dependency. Bug-AGL: SPEC-4014 Signed-off-by: Naoto Yamaguchi <i33399_yamaguchi@aisin-aw.co.jp> Change-Id: I7863a00576ead96b33428907a67c0ab6af33358c
Diffstat (limited to 'templates')
-rw-r--r--templates/feature/agl-lxc/50_bblayers.conf.inc5
-rw-r--r--templates/feature/agl-lxc/50_local.conf.inc9
-rw-r--r--templates/feature/agl-lxc/included.dep2
3 files changed, 11 insertions, 5 deletions
diff --git a/templates/feature/agl-lxc/50_bblayers.conf.inc b/templates/feature/agl-lxc/50_bblayers.conf.inc
index 766d1da3..de0b2864 100644
--- a/templates/feature/agl-lxc/50_bblayers.conf.inc
+++ b/templates/feature/agl-lxc/50_bblayers.conf.inc
@@ -1,3 +1,8 @@
+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-qt5 \
${METADIR}/meta-agl-devel/meta-agl-lxc \
diff --git a/templates/feature/agl-lxc/50_local.conf.inc b/templates/feature/agl-lxc/50_local.conf.inc
index 6f337415..3c652b41 100644
--- a/templates/feature/agl-lxc/50_local.conf.inc
+++ b/templates/feature/agl-lxc/50_local.conf.inc
@@ -1,7 +1,8 @@
BBMULTICONFIG = "agl-container-guest"
-# Disable the meta-virtualization configuration support enabled by
-# agl-virt. This should be revisited when upgrading past dunfell,
-# as less of the extra configuration may be enabled in the future.
-DISTRO_FEATURES_remove = "virtualization"
+# The meta-virtualization has a sanity-meta-virt check.
+# This checker check 'DISTRO_FEATURES has virtualization', but
+# in case of linux container is not necessary to the 'virtualization'.
+# This should be revisited when upgrading past dunfell, as less of
+# the extra configuration may be enabled in the future.
INHERIT_remove = "sanity-meta-virt"
diff --git a/templates/feature/agl-lxc/included.dep b/templates/feature/agl-lxc/included.dep
index df937c78..b7e96fbb 100644
--- a/templates/feature/agl-lxc/included.dep
+++ b/templates/feature/agl-lxc/included.dep
@@ -1 +1 @@
-agl-virt agl-drm-lease
+agl-drm-lease