summaryrefslogtreecommitdiffstats
path: root/meta-speech-framework/conf
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-10-18 14:24:52 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-11-04 14:24:38 +0000
commite345e16bb494864caf1f7dbe8864aa40df401a70 (patch)
treec309d39646f3e796344cc68081f5bff48cf63e2c /meta-speech-framework/conf
parent796e9aefb7eee0fc7526e5613a03bc7f6697cef4 (diff)
Prepare master for new framework integration
During the last workshop the transition to the new framework was presented. This change essentially deprecates the SMACK-based application framework. To prepare the integration of it, we remove the deprecated components: - meta-speech-framework and the voiceagent services Bug-AGL: SPEC-4121 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: I803dd18184338a1f5519af27136e1d5a58ee9369
Diffstat (limited to 'meta-speech-framework/conf')
-rw-r--r--meta-speech-framework/conf/include/agl-voiceagent-alexa.inc17
-rw-r--r--meta-speech-framework/conf/layer.conf27
2 files changed, 0 insertions, 44 deletions
diff --git a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc b/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
deleted file mode 100644
index 10f08301..00000000
--- a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-# A bbappend has been added to meta-agl to enable nghttp2, mask out the one
-# from meta-aac to avoid triggering rebuilds of all curl dependencies when
-# agl-voiceagent-alexa is configured.
-BBMASK += "meta-aac/recipes-support/curl/curl_%.bbappend"
-# Mask out the nghttp2 recipe in meta-aac as well, as a newer version
-# is available in meta-networking, and due to meta-aac having a higher
-# layer priority, rebuilds will be triggered when the voiceagent feature
-# is configured and the layer is added.
-BBMASK += "meta-aac/recipes-connectivity/nghttp2"
-# Mask out the duplicate libopus recipe in meta-aac for the same reason
-BBMASK += "meta-aac/recipes-multimedia/libopus"
-
-PREFERRED_RPROVIDER_virtual/voice-high-config = "alexa-voice-high-config"
-
-FEATURE_PACKAGES:agl-voiceagent-alexa = "packagegroup-agl-voiceagent-alexa"
-
-AGL_FEATURES += "agl-voiceagent-alexa"
diff --git a/meta-speech-framework/conf/layer.conf b/meta-speech-framework/conf/layer.conf
deleted file mode 100644
index b3f004ce..00000000
--- a/meta-speech-framework/conf/layer.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# Let us add layer-specific bbappends which are only applied when that
-# layer is included in our configuration -
-# e.g. only add layers if a bsp is present.
-# This is based on the BBFILE_COLLECTIONS name of the layer.
-# We use either the BBFILE_COLLECTIONS name of the layer directly (meta-ti)
-BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
- for layer in BBFILE_COLLECTIONS.split())}"
-BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bb' % layer \
- for layer in BBFILE_COLLECTIONS.split())}"
-# or we prepend it with meta- (e.g. rpi, fsl*)
-BBFILES += "${@' '.join('${LAYERDIR}/meta-%s/recipes*/*/*.bbappend' % layer \
- for layer in BBFILE_COLLECTIONS.split())}"
-BBFILES += "${@' '.join('${LAYERDIR}/meta-%s/recipes*/*/*.bb' % layer \
- for layer in BBFILE_COLLECTIONS.split())}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "speech-framework"
-BBFILE_PATTERN_speech-framework = "^${LAYERDIR}/"
-BBFILE_PRIORITY_speech-framework = "8"
-
-LAYERSERIES_COMPAT_speech-framework = "dunfell"