summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
e9ec6a9)
Changes:
- Remove feature templates and associated include files for the
agl-cluster-demo and agl-telematics-demo features. All of the
demo images can now be built by just configuring with the agl-demo
feature.
- Remove feature template for agl-cluster-demo-preload, the cluster
demo configuration it was pulling into the cluster image is now
driven by the agl-demo-preload feature instead.
- Moved speech framework and Alexa voiceagent feature inclusion to
agl-demo-platform.inc to avoid them accidentally being pulled into
the cluster or telematics demo images. Part of this change is
moving agl-voiceagent-alexa from using IMAGE_FEATURES to
AGL_FEATURES, which needs a corresponding change to meta-agl-devel.
- Remove leftover use of agl-core-image-profile DISTRO_FEATURE, which
no longer exists.
- Remove unneeded explicit dependency on the
PREFERRED_RPROVIDER_virtual/voice-high-config, things seem to be
working fine with the dependency from agl-service-voice-high, so it
is not required.
Bug-AGL: SPEC-3749
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ibcfbce28231a91aa56269db9196c471458d0e928
15 files changed:
+++ /dev/null
-AGL_FEATURES_append = " agl-cluster-demo-preload"
+++ /dev/null
-IMAGE_FEATURES =+ "debug-tweaks"
-
-#DISTRO_FEATURES_append = " "
-
-#IMAGE_INSTALL_append = " "
# voice api inclusion
PREFERRED_RPROVIDER_virtual/voice-high-config = "default-voice-high-config"
FEATURE_PACKAGES_agl-speech-framework = "packagegroup-agl-speech-services"
# voice api inclusion
PREFERRED_RPROVIDER_virtual/voice-high-config = "default-voice-high-config"
FEATURE_PACKAGES_agl-speech-framework = "packagegroup-agl-speech-services"
-IMAGE_FEATURES += "agl-speech-framework"
+++ /dev/null
-IMAGE_FEATURES =+ "debug-tweaks"
-
-#DISTRO_FEATURES_append = " "
-
-#IMAGE_INSTALL_append = " "
-IMAGE_FEATURES_append = " \
- "
+IMAGE_FEATURES_append = ""
# add packages for cluster demo platform (include demo apps) here
IMAGE_INSTALL_append = " \
packagegroup-agl-cluster-demo-platform \
# 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)} \
# Base image
require agl-image-ivi.inc
# 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)}"
"
IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
"
IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
-DISTRO_FEATURES_append = " agl-core-image-profile"
agl-service-signal-composer \
"
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 \
RDEPENDS_${PN}_append = " \
weston-ini-conf-landscape \
hmi-debug \
linux-firmware-ralink \
${AGL_APPS} \
${AGL_APIS} \
linux-firmware-ralink \
${AGL_APPS} \
${AGL_APIS} \
RDEPENDS_${PN} += "\
agl-service-voice-high \
agl-service-voice-high-capabilities \
RDEPENDS_${PN} += "\
agl-service-voice-high \
agl-service-voice-high-capabilities \
- ${PREFERRED_RPROVIDER_virtual/voice-high-config} \
+++ /dev/null
-#see meta-agl-cluster-demo/conf/include/agl-cluster-demo-preload.inc
-require conf/include/agl-cluster-demo-preload.inc
+++ /dev/null
----
-description: Feature agl-cluster-demo-preload
-authors: Scott Murray <scott.murray@konsulko.com>
----
-
-### Feature agl-cluster-demo-preload
-
-*Description is missing - please complete file meta-agl-cluster-demo/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md*
-
+++ /dev/null
-#see meta-agl-cluster-demo/conf/include/agl-cluster-demo.inc
-require conf/include/agl-cluster-demo.inc
+++ /dev/null
-#see meta-agl-telematics-demo/conf/include/agl-telematics-demo.inc
-require conf/include/agl-telematics-demo.inc
+++ /dev/null
-agl-demo
\ No newline at end of file