From c7e0ab217d11f354d44074b8fe75ed603201fdb6 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 29 Nov 2013 14:12:33 +0100 Subject: [PATCH] alsa-state: remove incorrect 'asound.conf' config file The default 'asound.conf' config file is not valid for our platforms and according to is not required. This allows to play several videos with gstreamer that were failing due to audio issues. It also fixes the problem of 'aplay' not playing audios with several (more than two) channels. https://jira.digi.com/browse/DEL-608 https://jira.digi.com/browse/DEL-872 Signed-off-by: Javier Viguera --- .../alsa-state/alsa-state.bbappend | 26 +++++++++---------- .../ccardimx28js/2.6.35.14/asound.state | 1 - .../alsa-state/ccardimx28js/3.10/asound.state | 1 - .../alsa-state/ccimx51js/asound.state | 1 - .../alsa-state/ccimx53js/asound.state | 1 - 5 files changed, 13 insertions(+), 17 deletions(-) delete mode 120000 meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.state delete mode 120000 meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.state delete mode 120000 meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.state delete mode 120000 meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend index db1f1a15f..358ffa3e7 100644 --- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend @@ -5,18 +5,18 @@ PR_append = "+${DISTRO}" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}/${PREFERRED_VERSION_linux-dey}:${THISDIR}/${PN}/${MACHINE}:" -SRC_URI_append_ccardimx28js = " \ - file://asound.inline_play.state \ - file://asound.inline.state \ - file://asound.micro_play.state \ - file://asound.micro.state \ - file://asound.play.state \ +SRC_URI += " \ + file://asound.inline_play.state \ + file://asound.inline.state \ + file://asound.micro_play.state \ + file://asound.micro.state \ + file://asound.play.state \ " -SRC_URI_append_mx5 = " \ - file://asound.inline_play.state \ - file://asound.inline.state \ - file://asound.micro_play.state \ - file://asound.micro.state \ - file://asound.play.state \ -" +# The default 'asound.conf' config file is not valid for our platforms and +# according to is not +# required +do_install_append() { + rm -f ${D}${sysconfdir}/asound.conf + ln -sf asound.micro_play.state ${D}${localstatedir}/lib/alsa/asound.state +} diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.state deleted file mode 120000 index 3b025b18e..000000000 --- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/2.6.35.14/asound.state +++ /dev/null @@ -1 +0,0 @@ -asound.micro_play.state \ No newline at end of file diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.state deleted file mode 120000 index 3b025b18e..000000000 --- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28js/3.10/asound.state +++ /dev/null @@ -1 +0,0 @@ -asound.micro_play.state \ No newline at end of file diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.state deleted file mode 120000 index 3b025b18e..000000000 --- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51js/asound.state +++ /dev/null @@ -1 +0,0 @@ -asound.micro_play.state \ No newline at end of file diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.state deleted file mode 120000 index 3b025b18e..000000000 --- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53js/asound.state +++ /dev/null @@ -1 +0,0 @@ -asound.micro_play.state \ No newline at end of file