summaryrefslogtreecommitdiffstats
path: root/recipes-platform
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-platform')
-rw-r--r--recipes-platform/images/agl-cluster-demo-platform.bb4
-rw-r--r--recipes-platform/images/agl-demo-platform.inc6
-rw-r--r--recipes-platform/images/agl-image-ivi.inc1
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb3
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-speech-services.bb1
5 files changed, 8 insertions, 7 deletions
diff --git a/recipes-platform/images/agl-cluster-demo-platform.bb b/recipes-platform/images/agl-cluster-demo-platform.bb
index 52d737b74..9af32ee42 100644
--- a/recipes-platform/images/agl-cluster-demo-platform.bb
+++ b/recipes-platform/images/agl-cluster-demo-platform.bb
@@ -4,11 +4,11 @@ require agl-cluster-demo-platform.inc
LICENSE = "MIT"
-IMAGE_FEATURES_append = " \
- "
+IMAGE_FEATURES_append = ""
# add packages for cluster demo platform (include demo apps) here
IMAGE_INSTALL_append = " \
packagegroup-agl-cluster-demo-platform \
+ ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "cluster-dashboard-demo-config", "", d)} \
"
diff --git a/recipes-platform/images/agl-demo-platform.inc b/recipes-platform/images/agl-demo-platform.inc
index f363e304f..e901409a3 100644
--- a/recipes-platform/images/agl-demo-platform.inc
+++ b/recipes-platform/images/agl-demo-platform.inc
@@ -1,2 +1,8 @@
# Base image
require agl-image-ivi.inc
+
+# Pull in speech framework bits
+IMAGE_FEATURES += "agl-speech-framework"
+
+# Pull in Alexa voiceagent if configured
+IMAGE_FEATURES += "${@bb.utils.filter("AGL_FEATURES", "agl-voiceagent-alexa", d)}"
diff --git a/recipes-platform/images/agl-image-ivi.inc b/recipes-platform/images/agl-image-ivi.inc
index 95b6ca688..6aa961bcd 100644
--- a/recipes-platform/images/agl-image-ivi.inc
+++ b/recipes-platform/images/agl-image-ivi.inc
@@ -13,4 +13,3 @@ IMAGE_INSTALL_append = "\
"
IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
-DISTRO_FEATURES_append = " agl-core-image-profile"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
index 612e26d45..910b55bd8 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb
@@ -31,8 +31,6 @@ AGL_APIS = " \
agl-service-signal-composer \
"
-DEMO_PRELOAD = "${@bb.utils.contains("DISTRO_FEATURES", "agl-cluster-demo-preload", "cluster-dashboard-demo-config", "",d)}"
-
RDEPENDS_${PN}_append = " \
weston-ini-conf-landscape \
hmi-debug \
@@ -40,5 +38,4 @@ RDEPENDS_${PN}_append = " \
linux-firmware-ralink \
${AGL_APPS} \
${AGL_APIS} \
- ${DEMO_PRELOAD} \
"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb b/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb
index 8dd97f394..acdeca72a 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb
@@ -10,5 +10,4 @@ PACKAGES = "\
RDEPENDS_${PN} += "\
agl-service-voice-high \
agl-service-voice-high-capabilities \
- ${PREFERRED_RPROVIDER_virtual/voice-high-config} \
"