Patchwork alsa-utils: move ${datadir}/init files to alsactl package.

login
register
mail settings
Submitter Enric Balletbo i Serra
Date March 19, 2012, 2:43 p.m.
Message ID <1332168207-18894-1-git-send-email-eballetbo@iseebcn.com>
Download mbox | patch
Permalink /patch/23809/
State Accepted
Commit fc6f49e283423b3ad25b1e7463fdf4e73a8a1f35
Headers show

Comments

Enric Balletbo i Serra - March 19, 2012, 2:43 p.m.
The alsa-utils-speakertest contains some files from ${datadir} directory
that are not correct, the files from  ${datadir}/init directory should
be included in alsa-utils-alsactl package instead.

This patch moves the ${datadir}/init files to alsactl package and fixes
following error at boot stage:

  /usr/sbin/alsactl: parse:1655: Unable to open file '/usr/share/alsa/init/00main': No such file or directory

Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
---
 meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Richard Purdie - March 20, 2012, 9:30 a.m.
On Mon, 2012-03-19 at 15:43 +0100, Enric Balletbo i Serra wrote:
> The alsa-utils-speakertest contains some files from ${datadir} directory
> that are not correct, the files from  ${datadir}/init directory should
> be included in alsa-utils-alsactl package instead.
> 
> This patch moves the ${datadir}/init files to alsactl package and fixes
> following error at boot stage:
> 
>   /usr/sbin/alsactl: parse:1655: Unable to open file '/usr/share/alsa/init/00main': No such file or directory
> 
> Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com>
> ---
>  meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
index 879a117..fa11479 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
@@ -6,7 +6,7 @@  LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
 DEPENDS = "alsa-lib ncurses libsamplerate0"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://ncursesfix.patch \
@@ -56,12 +56,12 @@  FILES_${PN} = ""
 FILES_alsa-utils-aplay       = "${bindir}/aplay ${bindir}/arecord"
 FILES_alsa-utils-amixer      = "${bindir}/amixer"
 FILES_alsa-utils-alsamixer   = "${bindir}/alsamixer"
-FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/"
+FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/speaker-test/"
 FILES_alsa-utils-midi        = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
 FILES_alsa-utils-aconnect    = "${bindir}/aconnect"
 FILES_alsa-utils-aseqnet     = "${bindir}/aseqnet"
 FILES_alsa-utils-iecset      = "${bindir}/iecset"
-FILES_alsa-utils-alsactl     = "${sbindir}/alsactl ${base_libdir}/udev/rules.d ${base_libdir}/systemd ${localstatedir}/lib/alsa"
+FILES_alsa-utils-alsactl     = "${sbindir}/alsactl ${base_libdir}/udev/rules.d ${base_libdir}/systemd ${localstatedir}/lib/alsa ${datadir}/alsa/init/"
 FILES_alsa-utils-aseqdump    = "${bindir}/aseqdump"
 FILES_alsa-utils-alsaconf    = "${sbindir}/alsaconf"
 FILES_alsa-utils-alsaloop    = "${bindir}/alsaloop"