summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-03-31 14:50:00 +0200
committerKoen Kooi <koen@openembedded.org>2009-03-31 14:50:00 +0200
commitd9436bc577a4e7c26e7b2066a23b26697cd0f3e5 (patch)
treee6ce194238c3b1e53fe377b9e24476315c5f3ca3
parentbf47a92957f8f84ef8a7876122a4d552d461b426 (diff)
downloadopenembedded-d9436bc577a4e7c26e7b2066a23b26697cd0f3e5.tar.gz
angstrom 2009.X: switch to bluez4
-rw-r--r--conf/distro/angstrom-2008.1.conf7
-rw-r--r--recipes/tasks/task-base.bb2
2 files changed, 8 insertions, 1 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index cde01e155f..57048d66a5 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 c60ae4ff0b..4003359dd1 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