diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-01-12 16:41:29 -0500 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-01-13 20:33:53 +0000 |
commit | d7d6c8622195aaf83bd66b53dec231d7b1c30bf1 (patch) | |
tree | 47c21ec8d25507f644507e413ce7608370eb9dd2 /conf/include | |
parent | e9ec6a99e6c1549a17d1eb36175fe437f69ce327 (diff) |
Remove separate agl-{cluster,telematics}-demo features
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
Diffstat (limited to 'conf/include')
-rw-r--r-- | conf/include/agl-cluster-demo-preload.inc | 1 | ||||
-rw-r--r-- | conf/include/agl-cluster-demo.inc | 5 | ||||
-rw-r--r-- | conf/include/agl-demo.inc | 1 | ||||
-rw-r--r-- | conf/include/agl-telematics-demo.inc | 5 |
4 files changed, 0 insertions, 12 deletions
diff --git a/conf/include/agl-cluster-demo-preload.inc b/conf/include/agl-cluster-demo-preload.inc deleted file mode 100644 index 70421e8cf..000000000 --- a/conf/include/agl-cluster-demo-preload.inc +++ /dev/null @@ -1 +0,0 @@ -AGL_FEATURES_append = " agl-cluster-demo-preload" diff --git a/conf/include/agl-cluster-demo.inc b/conf/include/agl-cluster-demo.inc deleted file mode 100644 index a8847e071..000000000 --- a/conf/include/agl-cluster-demo.inc +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE_FEATURES =+ "debug-tweaks" - -#DISTRO_FEATURES_append = " " - -#IMAGE_INSTALL_append = " " diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc index 7d6db8ce4..55f2e8ab0 100644 --- a/conf/include/agl-demo.inc +++ b/conf/include/agl-demo.inc @@ -18,4 +18,3 @@ PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "${@bb.utils.contains('DISTRO # 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" diff --git a/conf/include/agl-telematics-demo.inc b/conf/include/agl-telematics-demo.inc deleted file mode 100644 index a8847e071..000000000 --- a/conf/include/agl-telematics-demo.inc +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE_FEATURES =+ "debug-tweaks" - -#DISTRO_FEATURES_append = " " - -#IMAGE_INSTALL_append = " " |