summaryrefslogtreecommitdiffstats
path: root/meta-speech-framework/conf
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-02-21 16:32:33 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-02-21 16:32:33 +0100
commiteaeded3d05c033a1011ed86219c678ef3c72240f (patch)
tree17fada653f21428f6ed20a519ade132d580aedbd /meta-speech-framework/conf
parent3a788ab8e1f5b076e09a694ba225f7132c6171bf (diff)
parent2938eb34a55ebb4cb0427314151b30fd97ef6e78 (diff)
Merge remote-tracking branch 'agl/next'
* agl/next: meta-speech-framework: enable building Alexa voiceagent against zeus Declare layer compatibility with zeus Change-Id: I9c717cde0b51635c14f683b8d1d66a563ec3d7ed
Diffstat (limited to 'meta-speech-framework/conf')
-rw-r--r--meta-speech-framework/conf/include/agl-voiceagent-alexa.inc5
-rw-r--r--meta-speech-framework/conf/layer.conf2
2 files changed, 6 insertions, 1 deletions
diff --git a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc b/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
index 10df0926..21da324e 100644
--- a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc
+++ b/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-speech-framework/conf/layer.conf b/meta-speech-framework/conf/layer.conf
index ce97b9e0..804eae66 100644
--- a/meta-speech-framework/conf/layer.conf
+++ b/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 = "zeus"