X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Finclude%2Fagl-demo.inc;h=17be8e90b1c4a264d2d239a509e02de8b553ecda;hb=39c3ae23a452272dbec96fb95b5928856eb05c42;hp=c3c051d88b54733fe087da094fb9d6cf028b5ebc;hpb=796f796a2895f2bd840e2eb514532339b53be013;p=AGL%2Fmeta-agl-demo.git

diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index c3c051d88..17be8e90b 100644
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -5,6 +5,13 @@ DISTRO_FEATURES_append = " automount "
 # convenience
 IMAGE_INSTALL_append = " screen mc "
 
+# 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 ''}"
+
 # Extend agl-voiceagent-alexa image feature with local alexa-viewer
 # package.
 FEATURE_PACKAGES_agl-voiceagent-alexa_append = " alexa-viewer"
@@ -12,7 +19,12 @@ FEATURE_PACKAGES_agl-voiceagent-alexa_append = " alexa-viewer"
 # enable the layer
 AGL_FEATURES_append = " agldemo"
 
+# Set preferred provider for low-can device mapping configuration
+PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'dev-mapping-ci', 'dev-mapping', d)}"
+
 # voice api inclusion
 PREFERRED_RPROVIDER_virtual/voice-high-config = "default-voice-high-config"
 FEATURE_PACKAGES_agl-speech-framework = "packagegroup-agl-speech-services"
-IMAGE_FEATURES += "agl-speech-framework"
+
+# install virtualbox drivers for vmdk
+IMAGE_INSTALL_append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}"