meta-agl-demo: move open-vm-tools and vboxguestdrivers to meta-agl-demo

[AGL/meta-agl-demo.git] / conf / include / agl-demo.inc

diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index 001f37d..63b024a 100644 (file)
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -1,19 +1,23 @@
 IMAGE_FEATURES =+ "debug-tweaks"
 
-# disable the webruntime
-#DISTRO_FEATURES_append = " webruntime "
 DISTRO_FEATURES_append = " automount "
 
+# 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 \
-    "
-
 # Extend agl-voiceagent-alexa image feature with local alexa-viewer
 # package.
 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)}"