egvirt feature updates with virtio-loopback

Automatically installs virtio-loopback when eg-virt feature is enabled.
This might be helpful to create images for CI testing.

It also aligns egvirt with other featues moving the .inc file outside
the template folder.

v2: restrict effects only to h3ulcb machine for virtio-loopback
components.

v3: revert to v1. We don't restrict the append to a specific machine.

Bug-AGL: SPEC-4834
Depends on change: 29407

Change-Id: I43222f1711b96e1c76028355611e9d8758204a17
Signed-off-by: Michele Paolino <m.paolino@virtualopensystems.com>

diff --git a/meta-egvirt/conf/include/agl-egvirt.inc b/meta-egvirt/conf/include/agl-egvirt.inc
new file mode 100644 (file)
index 0000000..1cdfdf6
--- /dev/null
+++ b/meta-egvirt/conf/include/agl-egvirt.inc
@@ -0,0 +1,19 @@
+# gstreamer1.0-plugins-bad contains:
+# * videoparsersbad plugin which contains h264parse element needed to demonstrate H.264 hardware decoding
+# * waylandsink plugin
+MACHINE_EXTRA_RDEPENDS:append = " \
+    kernel-module-virtio-video \
+    gstreamer1.0-plugins-bad \
+"
+
+MACHINE_EXTRA_RDEPENDS:append = " \
+    kernel-module-virtio-can \
+"
+
+# add driver for supporting vhost devices loopback (virtio-loopback)
+MACHINE_EXTRA_RDEPENDS:append = " \
+    virtio-loopback-driver \
+"
+
+IMAGE_INSTALL:append = " vhost-device-i2c vhost-device-rng vhost-device-vsock vhost-device-gpio "
+

diff --git a/templates/feature/agl-egvirt/50_local.conf.inc b/templates/feature/agl-egvirt/50_local.conf.inc
index dbe544b..3062504 100644 (file)
--- a/templates/feature/agl-egvirt/50_local.conf.inc
+++ b/templates/feature/agl-egvirt/50_local.conf.inc
@@ -1,11 +1,3 @@
-# gstreamer1.0-plugins-bad contains:
-# * videoparsersbad plugin which contains h264parse element needed to demonstrate H.264 hardware decoding
-# * waylandsink plugin
-MACHINE_EXTRA_RDEPENDS:append = " \
-    kernel-module-virtio-video \
-    gstreamer1.0-plugins-bad \
-"
+#see meta-agl-devel/meta-egvirt/conf/include/agl-egvirt.inc
+require conf/include/agl-egvirt.inc
 
-MACHINE_EXTRA_RDEPENDS:append = " \
-    kernel-module-virtio-can \
-"