From: Scott Murray <scott.murray@konsulko.com>
Date: Mon, 14 Jun 2021 23:18:07 +0000 (-0400)
Subject: Add kernel-modules package to demo images
X-Git-Tag: 11.93.0~4
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=39c3ae23a452272dbec96fb95b5928856eb05c42;p=AGL%2Fmeta-agl-demo.git

Add kernel-modules package to demo images

Add the kernel-modules meta package to demo images in the agl-demo.inc
aglsetup.sh template.  This change is to balance out a removal done
in the base template in meta-agl and retain the build of all kernel
modules into the demo platform images for developer convenience.

Note that the inclusion is conditional on the virtual/kernel provider
not being linux-dummy, as it is desirable to leave even the dummy
kernel-modules package out of container images to avoid confusion.

Bug-AGL: SPEC-3983

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I3c4e3876c11d7fb3f1796841aad8a9a463d8e513
---

diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index 63b024ad2..17be8e90b 100644
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -5,6 +5,13 @@ DISTRO_FEATURES_append = " automount "
 # convenience
 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"