Update recipes for transition to UNPACKDIR

[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 55f2e8a..caba58c 100644 (file)
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -1,20 +1,26 @@
 IMAGE_FEATURES =+ "debug-tweaks"
 
-DISTRO_FEATURES_append = " automount "
+DISTRO_FEATURES:append = " automount "
 
 # convenience
-IMAGE_INSTALL_append = " screen mc "
+IMAGE_INSTALL:append = " screen mc "
 
-# Extend agl-voiceagent-alexa image feature with local alexa-viewer
-# package.
-FEATURE_PACKAGES_agl-voiceagent-alexa_append = " alexa-viewer"
+# 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 ''}"
 
 # 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)}"
+# install virtualbox drivers for vmdk
+#IMAGE_INSTALL:append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}"
 
-# voice api inclusion
-PREFERRED_RPROVIDER_virtual/voice-high-config = "default-voice-high-config"
-FEATURE_PACKAGES_agl-speech-framework = "packagegroup-agl-speech-services"
+# 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"