summaryrefslogtreecommitdiffstats
path: root/meta-agl-devel/meta-speech-framework/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl-devel/meta-speech-framework/conf')
-rw-r--r--meta-agl-devel/meta-speech-framework/conf/include/agl-speech-framework.inc4
-rw-r--r--meta-agl-devel/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc5
-rw-r--r--meta-agl-devel/meta-speech-framework/conf/layer.conf2
3 files changed, 10 insertions, 1 deletions
diff --git a/meta-agl-devel/meta-speech-framework/conf/include/agl-speech-framework.inc b/meta-agl-devel/meta-speech-framework/conf/include/agl-speech-framework.inc
index ee19d25f..700aadf1 100644
--- a/meta-agl-devel/meta-speech-framework/conf/include/agl-speech-framework.inc
+++ b/meta-agl-devel/meta-speech-framework/conf/include/agl-speech-framework.inc
@@ -1 +1,5 @@
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/meta-agl-devel/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc b/meta-agl-devel/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
index 10df0926..21da324e 100644
--- a/meta-agl-devel/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
+++ b/meta-agl-devel/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
@@ -2,6 +2,11 @@
# 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, since the same 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"
PREFERRED_RPROVIDER_virtual/voice-high-config = "alexa-voice-high-config"
diff --git a/meta-agl-devel/meta-speech-framework/conf/layer.conf b/meta-agl-devel/meta-speech-framework/conf/layer.conf
index ce97b9e0..b3f004ce 100644
--- a/meta-agl-devel/meta-speech-framework/conf/layer.conf
+++ b/meta-agl-devel/meta-speech-framework/conf/layer.conf
@@ -24,4 +24,4 @@ BBFILE_COLLECTIONS += "speech-framework"
BBFILE_PATTERN_speech-framework = "^${LAYERDIR}/"
BBFILE_PRIORITY_speech-framework = "8"
-LAYERSERIES_COMPAT_speech-framework = "thud"
+LAYERSERIES_COMPAT_speech-framework = "dunfell"