8 files changed, 1 insertions, 36 deletions
diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf
index 0d8e9bcaf7..ee56a05e05 100644
--- a/conf/compatibility-providers.conf
+++ b/conf/compatibility-providers.conf
@@ -5,8 +5,6 @@
 #PREFERRED_PROVIDER_atd ?= "atd-over-fso"
 PREFERRED_PROVIDER_atd ?= "atd"
 PREFERRED_PROVIDER_avahi ?= "avahi"
-PREFERRED_PROVIDER_bluez-libs ?= "bluez4"
-PREFERRED_PROVIDER_bluez-utils ?= "bluez4"
 PREFERRED_PROVIDER_bluez-utils-dbus ?= "bluez-utils"
 PREFERRED_PROVIDER_classpath ?= "classpath"
 PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 85d6f3f48a..507e644bff 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -134,9 +134,6 @@ PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_hotplug               = "udev"
 PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg-nocurl"
 
-ANGSTROM_BLACKLIST_pn-bluez-libs	= "bluez-libs 3.x has been replaced by bluez4"
-ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez-utils 3.x has been replaced by bluez4"
-
 ANGSTROM_BLACKLIST_pn-fso-apm       = "regular apmd is good enough"
 
 require conf/distro/include/angstrom.inc
@@ -153,13 +150,6 @@ XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse x
 
 # 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/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 10a2bc4a02..050f175b66 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -166,11 +166,7 @@ PREFERRED_PROVIDER_avahi			?= "avahi"
 PREFERRED_PROVIDER_gconf			?= "gconf"
 PREFERRED_PROVIDER_virtual/libusb0		?= "libusb-compat"
 
-# we use bluez4 instead of the older bluez3
-DISTRO_BLUETOOTH_MANAGER			= "bluez4"
 PREFERRED_PROVIDER_bluez-utils-dbus		= "bluez-utils"
-PREFERRED_PROVIDER_bluez-libs			= "bluez4"
-PREFERRED_PROVIDER_bluez-utils			= "bluez4"
 
 # Include any package preferred versions and srcrevs:
 
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index ee187ba0c9..db7608e646 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -128,10 +128,6 @@ PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_hotplug               = "udev"
 PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg-nocurl"
 
-# see recipes/bluez/bluez4*.bb for further dependencies of this setting 
-ANGSTROM_BLACKLIST_pn-bluez-libs	= "bluez-libs 3.x has been replaced by bluez4"
-ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez-utils 3.x has been replaced by bluez4"
-
 ANGSTROM_BLACKLIST_pn-fso-apm       = "regular apmd is good enough"
 
 require conf/distro/include/kaeilos.inc
@@ -150,13 +146,6 @@ XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse x
 
 # 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/conf/distro/micro.conf b/conf/distro/micro.conf
index d9fc595303..5053987182 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -103,5 +103,3 @@ USE_LDCONFIG = "0"
 
 # Disable online package management
 ONLINE_PACKAGE_MANAGEMENT = "none"
-
-DISTRO_BLUETOOTH_MANAGER = "bluez4"
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 8e0ae2eb34..a99710955e 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -21,8 +21,6 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi
 #############################################################################
 # FEATURE SELECTION
 #############################################################################
-# Use bluetooth 4.0
-DISTRO_BLUETOOTH_MANAGER = "bluez4"
 # We want images supporting the following features (for task-base)
 DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci"
 # Following features are for ARM and E500 based machines
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 81d7075fc1..0a7c9e1748 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -41,7 +41,7 @@ DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost"
 # Some features (bluetooth, usbgadget) include packages we do not like.
 # Pick some of the packages manually.
 DISTRO_EXTRA_RDEPENDS += " \
-    bluez4 \
+    bluez-utils \
     kernel-module-g-ether \
     "
 
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 5417f5b06d..f463cde32e 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -44,8 +44,6 @@ INHERIT += "testlab"
 #activate the angstrom blacklister
 INHERIT += "angstrom"
 
-ANGSTROM_BLACKLIST_pn-bluez-libs  = "bluez-libs 3.x has been replaced by bluez4"
-ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"
 ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso"
 ANGSTROM_BLACKLIST_pn-update-alternatives-cworth-native = "update-alternatives-cworth-native has been replaced by opkg implementation of u-a script"
 ANGSTROM_BLACKLIST_pn-update-alternatives-cworth = "update-alternatives-cworth has been replaced by opkg implementation of u-a script"
@@ -96,8 +94,6 @@ ILLUME_THEME = "e-wm-theme-illume-gry"
 #############################################################################
 # FEATURE SELECTION
 #############################################################################
-# Use bluetooth 4.0
-DISTRO_BLUETOOTH_MANAGER = "bluez4"
 # We want images supporting the following features (for task-base)
 DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci"
 # Following features are for ARM and E500 based machines