X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Finclude%2Fagl-demo.inc;h=99085c1837e5c6e31ff3115cc5c4554c8c0e2306;hb=39153bea2418c48bf8618f34ddb4fb336501671f;hp=55f2e8ab0401b0262763815ce5232673879a9d57;hpb=d7d6c8622195aaf83bd66b53dec231d7b1c30bf1;p=AGL%2Fmeta-agl-demo.git

diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index 55f2e8ab0..99085c183 100644
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -1,16 +1,23 @@
 IMAGE_FEATURES =+ "debug-tweaks"
 
-DISTRO_FEATURES_append = " automount "
+DISTRO_FEATURES:append = " automount "
 
 # convenience
-IMAGE_INSTALL_append = " screen mc "
+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"
+FEATURE_PACKAGES_agl-voiceagent-alexa:append = " alexa-viewer"
 
 # enable the layer
-AGL_FEATURES_append = " agldemo"
+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)}"
@@ -18,3 +25,6 @@ PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "${@bb.utils.contains('DISTRO
 # voice api inclusion
 PREFERRED_RPROVIDER_virtual/voice-high-config = "default-voice-high-config"
 FEATURE_PACKAGES_agl-speech-framework = "packagegroup-agl-speech-services"
+
+# install virtualbox drivers for vmdk
+IMAGE_INSTALL:append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}"