From 910541b2b933f4a437ea83ec3ec19242a41a3630 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Sun, 9 Jun 2019 23:11:58 +0200 Subject: Supporting commits for the switch to pipewire MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We move all components around meta-audio-soundmanager-framework to that layer (still kept on request). We deprecate the meta-audio-4a-framework layer for Happy Halibut. Bug-AGL: SPEC-2473 Change-Id: I2a7c9d815801a3f8ea80943165ea6fd1422533ea Signed-off-by: Jan-Simon Möller --- templates/feature/agl-audio-4a-framework/50_bblayers.conf.inc | 5 ----- templates/feature/agl-audio-4a-framework/50_local.conf.inc | 2 -- templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc | 2 ++ 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 templates/feature/agl-audio-4a-framework/50_bblayers.conf.inc delete mode 100644 templates/feature/agl-audio-4a-framework/50_local.conf.inc (limited to 'templates') diff --git a/templates/feature/agl-audio-4a-framework/50_bblayers.conf.inc b/templates/feature/agl-audio-4a-framework/50_bblayers.conf.inc deleted file mode 100644 index a4889083..00000000 --- a/templates/feature/agl-audio-4a-framework/50_bblayers.conf.inc +++ /dev/null @@ -1,5 +0,0 @@ - -BBLAYERS =+ " \ - ${METADIR}/meta-agl-devel/meta-audio-4a-framework \ - " - diff --git a/templates/feature/agl-audio-4a-framework/50_local.conf.inc b/templates/feature/agl-audio-4a-framework/50_local.conf.inc deleted file mode 100644 index 91d4c863..00000000 --- a/templates/feature/agl-audio-4a-framework/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -#see meta-agl-devel/meta-audio-4a-framework/conf/include/agl-audio-4a-framework.inc -require conf/include/agl-audio-4a-framework.inc diff --git a/templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc b/templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc index 58a53389..70852b7d 100644 --- a/templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc +++ b/templates/feature/agl-audio-soundmanager-framework/50_local.conf.inc @@ -1,4 +1,6 @@ DISTRO_FEATURES_append = " agl-audio-soundmanager-framework pulseaudio" +IMAGE_INSTALL_append += "agl-service-audio-soundmanager pulseaudio-config-soundmanager audiomanager-plugins-config-soundmanager" + PREFERRED_PROVIDER_virtual/audio-framework = "agl-service-audio-soundmanager" PREFERRED_RPROVIDER_virtual/pulseaudio-config = "pulseaudio-config-soundmanager" PREFERRED_RPROVIDER_virtual/audiomanager-plugins-config = "audiomanager-plugins-config-soundmanager" -- cgit 1.2.3-korg