X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Finclude%2Fagl-demo.inc;h=caba58cc8710d98833bb1f03156b62b1684de9d5;hb=068c915d074011459e360c21979d79df42e152ee;hp=63b024ad23e581262c532bf31e68563a8b5b2428;hpb=42bf046b1b0f8294685d6b89cbed4af1c75ad2b1;p=AGL%2Fmeta-agl-demo.git

diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index 63b024ad2..caba58cc8 100644
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -1,23 +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"
-
-# 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"
+AGL_FEATURES:append = " agldemo"
 
 # install virtualbox drivers for vmdk
-IMAGE_INSTALL_append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}"
+#IMAGE_INSTALL:append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}"
+
+# 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"