From 97d9a76cc73cec3ffadb9539cc76e56beaf8a9bc Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Mon, 5 Jul 2021 05:40:23 +0000 Subject: 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 Change-Id: I7863a00576ead96b33428907a67c0ab6af33358c --- templates/feature/agl-lxc/50_bblayers.conf.inc | 5 +++++ templates/feature/agl-lxc/50_local.conf.inc | 9 +++++---- templates/feature/agl-lxc/included.dep | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'templates') 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 -- cgit 1.2.3-korg