6 files changed, 21 insertions, 12 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 504332f9a5..c60ae4ff0b 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -61,6 +61,15 @@ HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug",""
 DISTRO_SSH_DAEMON ?= "dropbear"
 
 #
+# bluetooth manager
+#
+DISTRO_BLUETOOTH_MANAGER ?= "\
+	blueprobe \
+	bluez-utils \
+	bluez-utils-compat \
+	"
+
+#
 # pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
 #
 PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
@@ -234,10 +243,8 @@ task-base-pcmcia26 = "\
 
 # Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! 
 
-RDEPENDS_task-base-bluetooth = "\ 
-    blueprobe \
-    bluez-utils \
-    bluez-utils-compat \  
+RDEPENDS_task-base-bluetooth = "\
+    ${DISTRO_BLUETOOTH_MANAGER} \
     "
 
 RRECOMMENDS_task-base-bluetooth = "\
diff --git a/packages/tasks/task-beagleboard-demo.bb b/packages/tasks/task-beagleboard-demo.bb
index 35c8d6582e..72edd0646d 100644
--- a/packages/tasks/task-beagleboard-demo.bb
+++ b/packages/tasks/task-beagleboard-demo.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task for Beagleboard-demo-image"
 
-PR = "r6"
+PR = "r7"
 
 inherit task 
 
@@ -37,6 +37,7 @@ RDEPENDS_${PN} = "\
 	angstrom-gnome-icon-theme-enable \
 	openssh-scp openssh-ssh \
 	picodlp-control \
+	connman-gnome \
 "
 
 # Install all kernel modules
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index 3d69256e64..1a74f15ad1 100644
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r47"
+PR = "r48"
 
 inherit task
 
diff --git a/packages/tasks/task-fso-compliance.bb b/packages/tasks/task-fso-compliance.bb
index c39df67513..62193ff817 100644
--- a/packages/tasks/task-fso-compliance.bb
+++ b/packages/tasks/task-fso-compliance.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The freesmartphone.org framework -- install this task to make you
 SECTION = "fso/base"
 LICENSE = "MIT"
 PV = "1.0"
-PR = "r6"
+PR = "r7"
 
 inherit task
 
@@ -11,13 +11,13 @@ RDEPENDS_${PN} = "\
   frameworkd \
 #  fso-apmd \
   fso-gpsd \
-#  fso-monitord \
+  fso-monitord \
   connman \
   connman-scripts \
   connman-plugin-bluetooth \
 #  connman-plugin-dhclient \
 #  connman-plugin-dnsproxy \
-  connman-plugin-ethernet \
+#  connman-plugin-ethernet \
 #  connman-plugin-fake \
   connman-plugin-loopback \
   connman-plugin-pppd \
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 97807cc279..9a9e385cfa 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r60"
+PR = "r61"
 
 inherit task
 
@@ -29,7 +29,8 @@ RDEPENDS_task-openmoko-feed = "\
   ntpclient ntp \
   openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
   python python-pygtk python-pyserial python-gst python-pygame \
-  python-lightblue python-pybluez \
+#  python-lightblue \
+  python-pybluez \
   obexpush \
   ruby \
   libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
diff --git a/packages/tasks/task-sdk-bare.bb b/packages/tasks/task-sdk-bare.bb
index ab338e6301..85d362612f 100644
--- a/packages/tasks/task-sdk-bare.bb
+++ b/packages/tasks/task-sdk-bare.bb
@@ -8,7 +8,7 @@ PACKAGES = "${PN}"
 GLIBC_PKGS = "\
     glibc \
     glibc-dbg \
-    glibc-dev \
+    virtual-libc-dev \
     glibc-utils \
     libsegfault \
     glibc-thread-db \