aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-03-25 10:03:40 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2011-03-25 10:18:14 +0100
commit61f9ea42230d9b0734827f9c56512b5196861b86 (patch)
tree9128fe6911fc2c879754d494eb624b86209a075e
parent76e1134237dee3878b98afc920b55949fb7bf4ea (diff)
downloadopenembedded-61f9ea42230d9b0734827f9c56512b5196861b86.zip
openembedded-61f9ea42230d9b0734827f9c56512b5196861b86.tar.gz
openembedded-61f9ea42230d9b0734827f9c56512b5196861b86.tar.bz2
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 <Martin.Jansa@gmail.com>
-rw-r--r--recipes/freesmartphone/fsoaudiod_git.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes/freesmartphone/fsoaudiod_git.bb b/recipes/freesmartphone/fsoaudiod_git.bb
index bfdfca4..7205f79 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/