X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Finclude%2Fagl-demo.inc;h=caba58cc8710d98833bb1f03156b62b1684de9d5;hb=068c915d074011459e360c21979d79df42e152ee;hp=b831a443335fcd37b618b8fa6ae468d7f92fe1c8;hpb=87ce94d22c1bcea17f847fdd0c0c546bcaca7ad2;p=AGL%2Fmeta-agl-demo.git

diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index b831a4433..caba58cc8 100644
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -1,14 +1,26 @@
 IMAGE_FEATURES =+ "debug-tweaks"
 
-DISTRO_FEATURES_append = " AGL_WEBRUNTIME "
+DISTRO_FEATURES:append = " automount "
 
-# Add webkit as workaround as webengine is broken right now
-IMAGE_INSTALL_append = " qtwebkit qtwebkit-examples-examples"
-#IMAGE_INSTALL_append = " qtsmarthome cinematicexperience qt5everywheredemo qt5-demo-extrafiles"
-#IMAGE_INSTALL_append = " qtwebengine-examples"
+# convenience
+IMAGE_INSTALL:append = " screen mc "
 
-# add support for websocket in Qt and QML
-IMAGE_INSTALL_append = " qtwebsockets qtwebsockets-qmlplugins"
+# Include all kernel modules here for ease-of-use during development.
+# Note that this is conditional on virtual/kernel not being linux-dummy
+# in order to allow building the demo images as containers.
+# Comment this out to switch to selecting the kernel modules
+# individually.
+IMAGE_INSTALL:append = " ${@'kernel-modules' if d.getVar('PREFERRED_PROVIDER_virtual/kernel') != 'linux-dummy' else ''}"
 
-IMAGE_INSTALL_append = " iotivity-resource-samples "
-IMAGE_INSTALL_append = " screen "
+# enable the layer
+AGL_FEATURES:append = " agldemo"
+
+# install virtualbox drivers for vmdk
+#IMAGE_INSTALL:append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}"
+
+# It is not clear these definitions affect image generation in a robust
+# way, but define them to both show our intent and quiet the warnings
+# that get spammed otherwise.
+PREFERRED_RPROVIDER_kuksa-val-certificates-ca = "kuksa-certificates-agl"
+PREFERRED_RPROVIDER_kuksa-val-certificates-server = "kuksa-certificates-agl"
+PREFERRED_RPROVIDER_kuksa-val-certificates-client = "kuksa-certificates-agl"