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

diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index 001f37d00..99085c183 100644
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -1,19 +1,30 @@
 IMAGE_FEATURES =+ "debug-tweaks"
 
-# disable the webruntime
-#DISTRO_FEATURES_append = " webruntime "
-DISTRO_FEATURES_append = " automount "
+DISTRO_FEATURES:append = " automount "
 
-IMAGE_INSTALL_append = " screen mc "
+# convenience
+IMAGE_INSTALL:append = " screen mc "
 
-# Add local packagegroups to agl-test-wgt and agl-devel-wgt image feature
-# package lists
-FEATURE_PACKAGES_agl-test-wgt_append = " packagegroup-agl-ivi-services-test"
-FEATURE_PACKAGES_agl-devel-wgt_append = " \
-    packagegroup-agl-ivi-services-devel \
-    packagegroup-agl-demo-platform-devel \
-    "
+# 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"
+
+# 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"
+
+# install virtualbox drivers for vmdk
+IMAGE_INSTALL:append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}"