aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2009-05-10 23:30:22 -0500
committerMike Westerhof <mwester@dls.net>2009-05-10 23:30:22 -0500
commiteaea0ee411da83f7c5349920c701a55a17384f8e (patch)
treef22baac44beac75ee42bcdc3cb8986c99c790e4f
parent6144619ef3fe1df5a562e63de12144ef99f3a503 (diff)
downloadopenembedded-eaea0ee411da83f7c5349920c701a55a17384f8e.tar.gz
SlugOS: remove bluez 3 from the package feeds; won't build with newer
kernel headers.
-rw-r--r--recipes/meta/slugos-packages.bb3
-rw-r--r--recipes/tasks/task-mokogateway.bb8
2 files changed, 7 insertions, 4 deletions
diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb
index 9ccc143823..0129ffce79 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 1575b41780..b0214dc388 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 = "\
"