[oe-commits] Martin.Jansa : shr/merge: shr prefer bluez4

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 06bb723e0c8ebef4e607eda8bbc3c97114bf160a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=06bb723e0c8ebef4e607eda8bbc3c97114bf160a

Author: Martin.Jansa <Martin.Jansa at gmail.com>
Date:   Fri Oct 16 12:18:06 2009 +0000

shr/merge: shr prefer bluez4

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/shr.conf           |    5 +++++
 recipes/tasks/task-shr-feed.bb |    1 -
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 15463a5..45dd8cc 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -57,6 +57,8 @@ DISTRO_EXTRA_RDEPENDS_append_om-gta02 = " \
     kernel-module-g-ether \
     "
 
+DISTRO_BLUETOOTH_MANAGER = "bluez4 blueprobe blueman"
+
 # 2.18 seems to break badly on 64-bit systems
 PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
 PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
@@ -78,6 +80,9 @@ PREFERRED_PROVIDER_opkg = "opkg"
 PREFERRED_PROVIDER_libgsmd = "libgsmd"
 PREFERRED_PROVIDER_bluez-libs = "bluez4"
 PREFERRED_PROVIDER_bluez-utils-dbus = "bluez4"
+PREFERRED_PROVIDER_bluez-utils = "bluez4"
+
+BBMASK = " bluez-libs bluez-utils "
 
 PREFERRED_PROVIDER_virtual/libusb0 = "libusb"
 PREFERRED_PROVIDER_libfribidi = "libfribidi"
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index c30e42c..0cb8021 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -27,7 +27,6 @@ RDEPENDS_${PN} += "\
 		vagalume \
 		python-pygame \
 		mokoko \
-		bluez-utils-alsa \
 #		devmem2 \
 		exhibit \
 		edje-viewer \