[oe-commits] Koen Kooi : angstrom 2009.X: switch to bluez4

[GIT User account]

Module: openembedded.git
Branch: stable/2009
Commit: 9f55682d70a21a62632b8f05b0e47c341da5052a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9f55682d70a21a62632b8f05b0e47c341da5052a

Author: Koen Kooi <koen at openembedded.org>
Date:   Tue Mar 31 10:40:13 2009 +0000

angstrom 2009.X: switch to bluez4

Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 conf/distro/angstrom-2008.1.conf |    7 +++++++
 recipes/tasks/task-base.bb       |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index cde01e1..57048d6 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -188,6 +188,13 @@ IPKG_VARIANT = "opkg-nogpg angstrom-version ${ANGSTROM_FEED_CONFIGS}"
 
 # do some task-base stuff here
 
+# Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with
+# bluez 3.x
+DISTRO_BLUETOOTH_MANAGER = "\
+	blueprobe \
+	bluez4 \
+   "
+
 # We want to ship extra debug utils in the rootfs when doing a debug build 
 DEBUG_APPS ?= ""
 DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb
index c60ae4f..4003359 100644
--- a/recipes/tasks/task-base.bb
+++ b/recipes/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r79"
+PR = "r80"
 
 inherit task