diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-02-21 16:32:33 +0100 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-02-21 16:32:33 +0100 |
| commit | eaeded3d05c033a1011ed86219c678ef3c72240f (patch) | |
| tree | 17fada653f21428f6ed20a519ade132d580aedbd /ATTIC/meta-audio-4a-framework/conf | |
| parent | 3a788ab8e1f5b076e09a694ba225f7132c6171bf (diff) | |
| parent | 2938eb34a55ebb4cb0427314151b30fd97ef6e78 (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 'ATTIC/meta-audio-4a-framework/conf')
| -rw-r--r-- | ATTIC/meta-audio-4a-framework/conf/include/agl-audio-4a-framework.inc | 24 | ||||
| -rw-r--r-- | ATTIC/meta-audio-4a-framework/conf/layer.conf | 23 |
2 files changed, 0 insertions, 47 deletions
diff --git a/ATTIC/meta-audio-4a-framework/conf/include/agl-audio-4a-framework.inc b/ATTIC/meta-audio-4a-framework/conf/include/agl-audio-4a-framework.inc deleted file mode 100644 index 12711f66..00000000 --- a/ATTIC/meta-audio-4a-framework/conf/include/agl-audio-4a-framework.inc +++ /dev/null @@ -1,24 +0,0 @@ -# In order to enable the audio-4a-framework features , -# enables the following line: -# -DISTRO_FEATURES_append = " agl-audio-4a-framework " - -# asound.conf is provided by the 4a-hal-config (and not by asound.state) -#VIRTUAL-RUNTIME_alsa-state = "4a-hal-config" -VIRTUAL_RUNTIME_alsa-state = "" -# additionally there is a bug in alsa-utils-alsactl where it pulls in alsa-state directly -RRECOMMENDS_pn-alsa-utils-alsactl = "VIRTUAL-RUNTIME_alsa-state" - -# why should a config package have -dev ... I'll leave that answer to you. -PACKAGES_pn-alsa-state_remove = "alsa-state-dev" -PACKAGES_pn-alsa-state_remove = "alsa-states-dev" -PACKAGES_pn-alsa-state = "alsa-state alsa-states" - -PREFERRED_PROVIDER_virtual/mixer ?= "4a-mixer" -PREFERRED_RPROVIDER_virtual/mixer ?= "4a-mixer" - -PREFERRED_VERSION_alsa-lib = "1.1.6" -PREFERRED_VERSION_alsa-plugins = "1.1.6" -PREFERRED_VERSION_alsa-tools = "1.1.6" -PREFERRED_VERSION_alsa-utils = "1.1.6" -PREFERRED_VERSION_alsa-utils-scripts = "1.1.6" diff --git a/ATTIC/meta-audio-4a-framework/conf/layer.conf b/ATTIC/meta-audio-4a-framework/conf/layer.conf deleted file mode 100644 index dc190b66..00000000 --- a/ATTIC/meta-audio-4a-framework/conf/layer.conf +++ /dev/null @@ -1,23 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# Fix for SPEC-1588 -# 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. -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 += "4a-framework" -BBFILE_PATTERN_4a-framework = "^${LAYERDIR}/" -BBFILE_PRIORITY_4a-framework = "8" - -LAYERSERIES_COMPAT_4a-framework = "thud" |