From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 27 Feb 2010 09:32:07 +0000 (+0100)
Subject: fsodeviced: use it as default alsa scenarii provider, drop fso-alsa-data from task... 
X-Git-Tag: Release-2010-05/1~491^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3a77580a5a22ff49d8322ad6ab14870c545dae9;p=openembedded.git

fsodeviced: use it as default alsa scenarii provider, drop fso-alsa-data from task-fso2-compliance, add RPROVIDES

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index 39433eec1e..78d39a2016 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -3,10 +3,12 @@ inherit fso-plugin
 
 DEPENDS += "alsa-lib libcanberra libfsoresource"
 RDEPENDS += "libcanberra-alsa"
-RRECOMMENDS += "fso-alsa-data"
+# Included in fsodeviced itself now
+# RRECOMMENDS += "fso-alsa-data"
+RPROVIDES_${PN} = "openmoko-alsa-scenarios virtual/alsa-scenarios"
 PV = "0.9.0+gitr${SRCREV}"
 PE = "1"
-PR = "${INC_PR}.9"
+PR = "${INC_PR}.10"
 
 EXTRA_OECONF = "\
   --enable-kernel26-rfkill \
diff --git a/recipes/tasks/task-fso2-compliance.bb b/recipes/tasks/task-fso2-compliance.bb
index bc5705bc1c..2d38b47c5e 100644
--- a/recipes/tasks/task-fso2-compliance.bb
+++ b/recipes/tasks/task-fso2-compliance.bb
@@ -3,7 +3,7 @@ Install this task to make your distribution FSO 2.0-compliant."
 SECTION = "fso/base"
 LICENSE = "MIT"
 PV = "1.9.0"
-PR = "r5"
+PR = "r6"
 
 inherit task
 
@@ -23,7 +23,8 @@ RDEPENDS_${PN} = "\
   fsonetworkd \
   fsousaged \
   \
-  fso-alsa-data \
+# included in fsodeviced now
+#  fso-alsa-data \
   fso-apm \
   fso-gpsd \
 #  fso-monitord \