From 61f9ea42230d9b0734827f9c56512b5196861b86 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 25 Mar 2011 10:03:40 +0100 Subject: [PATCH] fsoaudiod: add asound.conf to CONFFILES and RCONFLICTS with alsa-state * fixes SHR bug http://trac.shr-project.org/trac/ticket/1350 Signed-off-by: Martin Jansa --- recipes/freesmartphone/fsoaudiod_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/freesmartphone/fsoaudiod_git.bb b/recipes/freesmartphone/fsoaudiod_git.bb index bfdfca4cfc..7205f79637 100644 --- a/recipes/freesmartphone/fsoaudiod_git.bb +++ b/recipes/freesmartphone/fsoaudiod_git.bb @@ -11,7 +11,7 @@ DEPENDS += "alsa-lib" SRCREV = "${FSO_CORNUCOPIA_SRCREV}" PV = "0.1.0+gitr${SRCPV}" PE = "2" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" inherit update-rc.d @@ -22,7 +22,9 @@ SRC_URI += "file://fsoaudiod" CONFFILES_${PN} = " \ ${sysconfdir}/freesmartphone/conf/palm_pre/fsoaudiod.conf \ + ${sysconfdir}/asound.conf \ " +RCONFLICTS_${PN} = "alsa-state" do_install_append() { install -d ${D}${sysconfdir}/init.d/ -- 2.11.4.GIT