summaryrefslogtreecommitdiffstats
path: root/conf/include
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-04-28 21:11:32 +0000
committerScott Murray <scott.murray@konsulko.com>2020-05-08 13:31:03 -0400
commitd11b688e620f042b4c19e3fcfa0aa9970b3624f5 (patch)
tree767bf47004567389fc9e0ae54e19e1826c0bc4f5 /conf/include
parent69d40194167df655116115f8864251594dbc8744 (diff)
Widget packaging rework
Changes include: - Add "agl-test-wgt" to IMAGE_FEATURES in the agl-demo template definition to yield the desired default behavior of the test widgets always being added to the agl-demo-platform image. - Created new devel and test packagegroup variants for several of the existing packagegroups to contain the associated widgets. - Added several services to the RDEPENDS in the definition of packagegroup-agl-ive-services that have been getting picked up by application RDEPENDS. This simplifies the test/devel packagegroup definitions. - Extend the agl-devel-wgt and agl-test-wgt FEATURE_PACKAGES variables as necessary to add the required corresponding widget packagegroups. - Shifted some non-applications and the use of packagegroup-hmi-framework around a bit in the definition of packagegroup-agl-demo-platform to improve clarity. - The alexa-viewer app and virtual/alexa-voiceagent-config package are now pulled in by extending the agl-voiceagent-alexa FEATURE_PACKAGES definition. This is a cleaner use of the image feature than the previous checking of IMAGE_FEATURES that was being done in the packagegroup-agl-demo-platform definition. Bug-AGL: SPEC-3300 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I0ace2d140fdceb1e0d778a0fe71d7f856a953ae4
Diffstat (limited to 'conf/include')
-rw-r--r--conf/include/agl-demo-preload.inc4
-rw-r--r--conf/include/agl-demo.inc12
2 files changed, 16 insertions, 0 deletions
diff --git a/conf/include/agl-demo-preload.inc b/conf/include/agl-demo-preload.inc
index a17d1403e..da46810b9 100644
--- a/conf/include/agl-demo-preload.inc
+++ b/conf/include/agl-demo-preload.inc
@@ -2,3 +2,7 @@ DISTRO_FEATURES_append = " agl-demo-preload"
# Use demo device mapping for low-can that enables sllin0
PREFERRED_RPROVIDER_virtual/low-can-dev-mapping = "dev-mapping-demo"
+
+# Extend agl-voiceagent-alexa image feature to preload voiceagent
+# configuration package.
+FEATURE_PACKAGES_agl-voiceagent-alexa_append = " virtual/alexa-voiceagent-config"
diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index 5a70196cb..001f37d00 100644
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -5,3 +5,15 @@ IMAGE_FEATURES =+ "debug-tweaks"
DISTRO_FEATURES_append = " automount "
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"