From 2b949a53448092b8384846c30a7470c3f9c44548 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Fri, 9 Feb 2024 18:08:04 +0100 Subject: virtio: fix bblayer dependencies and include file To make the feature build, we need to adapt the dependencies. There are also 2 packages that do not build - mask them till they are fixed. Bug-AGL: SPEC-4834 Change-Id: Id35be44e14d2c0c429e403126953c3d5c78241a6 Signed-off-by: Jan-Simon Moeller --- meta-egvirt/conf/include/agl-egvirt.inc | 9 +++++++-- meta-egvirt/conf/layer.conf | 2 +- templates/feature/agl-egvirt/50_bblayers.conf.inc | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/meta-egvirt/conf/include/agl-egvirt.inc b/meta-egvirt/conf/include/agl-egvirt.inc index 59a266fd..ac60d5bd 100644 --- a/meta-egvirt/conf/include/agl-egvirt.inc +++ b/meta-egvirt/conf/include/agl-egvirt.inc @@ -6,9 +6,14 @@ FEATURE_PACKAGES_virtio-loopback = " \ virtio-loopback-adapter \ vhost-device-rng \ vhost-device-gpio \ - vhost-device-can \ - vhost-device-console \ " EXTRA_IMAGE_FEATURES += "virtio-loopback" + +FEATURE_PACKAGES_virtio-loopback-brokenbuild = " \ + vhost-device-can \ + vhost-device-console \ + " + +#EXTRA_IMAGE_FEATURES += "virtio-loopback-brokenbuild" diff --git a/meta-egvirt/conf/layer.conf b/meta-egvirt/conf/layer.conf index 364c0a92..a8dcafd8 100644 --- a/meta-egvirt/conf/layer.conf +++ b/meta-egvirt/conf/layer.conf @@ -13,4 +13,4 @@ BBFILE_PRIORITY_egvirt = "61" LAYERVERSION_egvirt = "1" LAYERSERIES_COMPAT_egvirt = "kirkstone" -LAYERDEPENDS_egvirt = "core" +LAYERDEPENDS_egvirt = "core clang-layer filesystems-layer" diff --git a/templates/feature/agl-egvirt/50_bblayers.conf.inc b/templates/feature/agl-egvirt/50_bblayers.conf.inc index c92ae5b4..424205fb 100644 --- a/templates/feature/agl-egvirt/50_bblayers.conf.inc +++ b/templates/feature/agl-egvirt/50_bblayers.conf.inc @@ -1,3 +1,8 @@ +# DEPENDENCIES +AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems" +AGL_META_CLANG = "${METADIR}/external/meta-clang" + + BBLAYERS =+ " \ ${METADIR}/meta-agl-devel/meta-egvirt \ " -- cgit 1.2.3-korg