[oe-commits] Mike Westerhof : SlugOS: remove bluez 3 from the package feeds; won' t build with newer

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: eaea0ee411da83f7c5349920c701a55a17384f8e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=eaea0ee411da83f7c5349920c701a55a17384f8e

Author: Mike Westerhof <mwester at dls.net>
Date:   Sun May 10 23:30:22 2009 -0500

SlugOS: remove bluez 3 from the package feeds; won't build with newer
kernel headers.

---

 recipes/meta/slugos-packages.bb   |    3 +--
 recipes/tasks/task-mokogateway.bb |    8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb
index 9ccc143..0129ffc 100644
--- a/recipes/meta/slugos-packages.bb
+++ b/recipes/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r63"
+PR = "r64"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -47,7 +47,6 @@ SLUGOS_PACKAGES = "\
 	bind \
 	binutils \
 	bison \
-	bluez-utils \
 	bluez-hcidump \
 	bluez4 \
 	bogofilter \
diff --git a/recipes/tasks/task-mokogateway.bb b/recipes/tasks/task-mokogateway.bb
index 1575b41..b0214dc 100644
--- a/recipes/tasks/task-mokogateway.bb
+++ b/recipes/tasks/task-mokogateway.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "MokoGateway: Tasks for a companion server for the Openmoko Linux Distribution"
 LICENSE = "MIT"
 PROVIDES = "task-mokogateway-everything"
-PR = "r5"
+PR = "r6"
 
 inherit task
 
@@ -33,7 +33,7 @@ RRECOMMENDS_task-mokogateway-usbnet = "\
 
 DESCRIPTION_task-mokogateway-bluetooth = "MokoGateway: Bluetooth"
 RDEPENDS_task-mokogateway-bluetooth = "\
-	bluez-utils \
+	bluez4 \
 "
 RRECOMMENDS_task-mokogateway-bluetooth = "\
 	kernel-module-bluetooth \
@@ -84,5 +84,9 @@ RDEPENDS_task-mokogateway-debug = "\
 # will, at least, get the feeds working again.
 #	dfu-util \
 #	openocd \
+#
+# The following packages are obsolete, and have been replaced.
+#	bluez-utils \
+
 RRECOMMENDS_task-mokogateway-debug = "\
 "