aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <clarson@mvista.com>2010-01-18 09:50:23 -0700
committerChris Larson <clarson@mvista.com>2010-01-18 09:54:09 -0700
commita053da8743966445342b495307e532178a1294e9 (patch)
tree7a9174fcf534081cef3d7b561743d9c597d9ea9c
parent1d1e92c5a2e25df8bb897c3c890cb05ac23fc274 (diff)
downloadopenembedded-kergoth/bluez.tar.gz
openembedded-kergoth/bluez.tar.bz2
openembedded-kergoth/bluez.zip
bluez: first pass of bluez4 -> bluez-libs/bluez-utils recipeskergoth/bluez
Signed-off-by: Chris Larson <clarson@mvista.com>
-rw-r--r--conf/compatibility-providers.conf2
-rw-r--r--conf/distro/angstrom-2008.1.conf10
-rw-r--r--conf/distro/include/slugos.inc4
-rw-r--r--conf/distro/kaeilos.conf11
-rw-r--r--conf/distro/micro.conf2
-rw-r--r--conf/distro/minimal.conf2
-rw-r--r--conf/distro/openmoko.conf2
-rw-r--r--conf/distro/shr.conf4
-rw-r--r--recipes/bluez/bluez-cups-backend_3.33.bb4
-rw-r--r--recipes/bluez/bluez-cups-backend_3.36.bb4
-rw-r--r--recipes/bluez/bluez-gstreamer-plugin_3.33.bb4
-rw-r--r--recipes/bluez/bluez-gstreamer-plugin_3.36.bb4
-rw-r--r--recipes/bluez/bluez-libs_4.31.bb5
-rw-r--r--recipes/bluez/bluez-libs_4.35.bb5
-rw-r--r--recipes/bluez/bluez-libs_4.37.bb5
-rw-r--r--recipes/bluez/bluez-libs_4.39.bb5
-rw-r--r--recipes/bluez/bluez-libs_4.41.bb5
-rw-r--r--recipes/bluez/bluez-libs_4.42.bb5
-rw-r--r--recipes/bluez/bluez-libs_4.47.bb9
-rw-r--r--recipes/bluez/bluez-libs_4.53.bb7
-rw-r--r--recipes/bluez/bluez-libs_4.56.bb7
-rw-r--r--recipes/bluez/bluez-utils-alsa_3.33.bb4
-rw-r--r--recipes/bluez/bluez-utils-alsa_3.36.bb4
-rw-r--r--recipes/bluez/bluez-utils.inc145
-rw-r--r--recipes/bluez/bluez-utils3.inc146
-rw-r--r--recipes/bluez/bluez-utils_3.33.bb4
-rw-r--r--recipes/bluez/bluez-utils_3.36.bb4
-rw-r--r--recipes/bluez/bluez-utils_4.31.bb3
-rw-r--r--recipes/bluez/bluez-utils_4.35.bb3
-rw-r--r--recipes/bluez/bluez-utils_4.37.bb3
-rw-r--r--recipes/bluez/bluez-utils_4.39.bb3
-rw-r--r--recipes/bluez/bluez-utils_4.41.bb3
-rw-r--r--recipes/bluez/bluez-utils_4.42.bb3
-rw-r--r--recipes/bluez/bluez-utils_4.47.bb (renamed from recipes/bluez/bluez4_4.56.bb)11
-rw-r--r--recipes/bluez/bluez-utils_4.53.bb (renamed from recipes/bluez/bluez4_4.47.bb)10
-rw-r--r--recipes/bluez/bluez-utils_4.56.bb (renamed from recipes/bluez/bluez4_4.53.bb)11
-rw-r--r--recipes/bluez/bluez.inc95
-rw-r--r--recipes/bluez/bluez4-4.31/avinfo-link.patch22
-rw-r--r--recipes/bluez/bluez4-4.35/avinfo-link.patch22
-rw-r--r--recipes/bluez/bluez4-4.37/avinfo-link.patch22
-rw-r--r--recipes/bluez/bluez4-4.39/avinfo-link.patch22
-rw-r--r--recipes/bluez/bluez4-4.47/avinfo-link.patch26
-rw-r--r--recipes/bluez/bluez4-4.53/avinfo-link.patch26
-rw-r--r--recipes/bluez/bluez4-4.53/separate-libs.patch251
-rw-r--r--recipes/bluez/bluez4-4.56/avinfo-link.patch26
-rw-r--r--recipes/bluez/bluez4-4.56/separate-libs.patch251
-rw-r--r--recipes/bluez/bluez4-libs.inc12
-rw-r--r--recipes/bluez/bluez4-utils.inc (renamed from recipes/bluez/bluez4_4.35.bb)46
-rw-r--r--recipes/bluez/bluez4.inc70
-rw-r--r--recipes/bluez/bluez4/avinfo-link.patch (renamed from recipes/bluez/bluez-libs/avinfo-link.patch)5
-rw-r--r--recipes/bluez/bluez4/hid2hci_usb_init.patch33
-rw-r--r--recipes/bluez/bluez4/sbc-thumb.patch11
-rw-r--r--recipes/bluez/bluez4/separate-libs.patch22
-rw-r--r--recipes/bluez/bluez4_4.31.bb64
-rw-r--r--recipes/bluez/bluez4_4.37.bb69
-rw-r--r--recipes/bluez/bluez4_4.39.bb4
-rw-r--r--recipes/bluez/bluez4_4.41.bb4
-rw-r--r--recipes/bluez/bluez4_4.42.bb5
-rw-r--r--recipes/tasks/task-base.bb3
59 files changed, 932 insertions, 642 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
diff --git a/recipes/bluez/bluez-cups-backend_3.33.bb b/recipes/bluez/bluez-cups-backend_3.33.bb
index f3601b424b..a6c05a12c4 100644
--- a/recipes/bluez/bluez-cups-backend_3.33.bb
+++ b/recipes/bluez/bluez-cups-backend_3.33.bb
@@ -1,4 +1,4 @@
-require bluez-utils3.inc
+require bluez-utils.inc
PR = "r1"
@@ -8,7 +8,7 @@ DEPENDS += "cups"
# albeit in a somewhat different form
SRC_URI += "file://hciattach-ti-bts.patch;patch=1"
-# see bluez-utils3.inc for the explanation of these option
+# see bluez-utils.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \
--enable-hid2hci \
diff --git a/recipes/bluez/bluez-cups-backend_3.36.bb b/recipes/bluez/bluez-cups-backend_3.36.bb
index 4bcb962f3c..06a598766a 100644
--- a/recipes/bluez/bluez-cups-backend_3.36.bb
+++ b/recipes/bluez/bluez-cups-backend_3.36.bb
@@ -1,9 +1,9 @@
-require bluez-utils3.inc
+require bluez-utils.inc
DEPENDS += "cups"
-# see bluez-utils3.inc for the explanation of these option
+# see bluez-utils.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \
--enable-hid2hci \
diff --git a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
index f4e3ca4d83..36e027993c 100644
--- a/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
+++ b/recipes/bluez/bluez-gstreamer-plugin_3.33.bb
@@ -1,4 +1,4 @@
-require bluez-utils3.inc
+require bluez-utils.inc
PR = "r1"
@@ -8,7 +8,7 @@ DEPENDS += "gstreamer gst-plugins-base "
# albeit in a somewhat different form
SRC_URI += "file://hciattach-ti-bts.patch;patch=1"
-# see bluez-utils3.inc for the explanation of these option
+# see bluez-utils.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \
--enable-hid2hci \
diff --git a/recipes/bluez/bluez-gstreamer-plugin_3.36.bb b/recipes/bluez/bluez-gstreamer-plugin_3.36.bb
index facad9cedd..67693dac15 100644
--- a/recipes/bluez/bluez-gstreamer-plugin_3.36.bb
+++ b/recipes/bluez/bluez-gstreamer-plugin_3.36.bb
@@ -1,9 +1,9 @@
-require bluez-utils3.inc
+require bluez-utils.inc
DEPENDS += "gstreamer gst-plugins-base "
-# see bluez-utils3.inc for the explanation of these option
+# see bluez-utils.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \
--enable-hid2hci \
diff --git a/recipes/bluez/bluez-libs_4.31.bb b/recipes/bluez/bluez-libs_4.31.bb
new file mode 100644
index 0000000000..987467ccdb
--- /dev/null
+++ b/recipes/bluez/bluez-libs_4.31.bb
@@ -0,0 +1,5 @@
+require bluez4-libs.inc
+
+PR = "${INC_PR}"
+
+SRC_URI += "file://avinfo-link.patch;patch=1;pnum=0"
diff --git a/recipes/bluez/bluez-libs_4.35.bb b/recipes/bluez/bluez-libs_4.35.bb
new file mode 100644
index 0000000000..987467ccdb
--- /dev/null
+++ b/recipes/bluez/bluez-libs_4.35.bb
@@ -0,0 +1,5 @@
+require bluez4-libs.inc
+
+PR = "${INC_PR}"
+
+SRC_URI += "file://avinfo-link.patch;patch=1;pnum=0"
diff --git a/recipes/bluez/bluez-libs_4.37.bb b/recipes/bluez/bluez-libs_4.37.bb
new file mode 100644
index 0000000000..987467ccdb
--- /dev/null
+++ b/recipes/bluez/bluez-libs_4.37.bb
@@ -0,0 +1,5 @@
+require bluez4-libs.inc
+
+PR = "${INC_PR}"
+
+SRC_URI += "file://avinfo-link.patch;patch=1;pnum=0"
diff --git a/recipes/bluez/bluez-libs_4.39.bb b/recipes/bluez/bluez-libs_4.39.bb
new file mode 100644
index 0000000000..987467ccdb
--- /dev/null
+++ b/recipes/bluez/bluez-libs_4.39.bb
@@ -0,0 +1,5 @@
+require bluez4-libs.inc
+
+PR = "${INC_PR}"
+
+SRC_URI += "file://avinfo-link.patch;patch=1;pnum=0"
diff --git a/recipes/bluez/bluez-libs_4.41.bb b/recipes/bluez/bluez-libs_4.41.bb
new file mode 100644
index 0000000000..987467ccdb
--- /dev/null
+++ b/recipes/bluez/bluez-libs_4.41.bb
@@ -0,0 +1,5 @@
+require bluez4-libs.inc
+
+PR = "${INC_PR}"
+
+SRC_URI += "file://avinfo-link.patch;patch=1;pnum=0"
diff --git a/recipes/bluez/bluez-libs_4.42.bb b/recipes/bluez/bluez-libs_4.42.bb
index 524b6643d6..987467ccdb 100644
--- a/recipes/bluez/bluez-libs_4.42.bb
+++ b/recipes/bluez/bluez-libs_4.42.bb
@@ -1,4 +1,5 @@
require bluez4-libs.inc
-PR = "${INC_PR}.1"
-DEFAULT_PREFERENCE = "-1"
+PR = "${INC_PR}"
+
+SRC_URI += "file://avinfo-link.patch;patch=1;pnum=0"
diff --git a/recipes/bluez/bluez-libs_4.47.bb b/recipes/bluez/bluez-libs_4.47.bb
new file mode 100644
index 0000000000..e58ecb3f74
--- /dev/null
+++ b/recipes/bluez/bluez-libs_4.47.bb
@@ -0,0 +1,9 @@
+require bluez4-libs.inc
+
+PR = "${INC_PR}"
+
+SRC_URI += "file://avinfo-link.patch;patch=1;pnum=0"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
+DEFAULT_PREFERENCE_shr = "1"
diff --git a/recipes/bluez/bluez-libs_4.53.bb b/recipes/bluez/bluez-libs_4.53.bb
new file mode 100644
index 0000000000..fef47e53ba
--- /dev/null
+++ b/recipes/bluez/bluez-libs_4.53.bb
@@ -0,0 +1,7 @@
+require bluez4-libs.inc
+
+PR = "${INC_PR}"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
+DEFAULT_PREFERENCE_shr = "1"
diff --git a/recipes/bluez/bluez-libs_4.56.bb b/recipes/bluez/bluez-libs_4.56.bb
new file mode 100644
index 0000000000..fef47e53ba
--- /dev/null
+++ b/recipes/bluez/bluez-libs_4.56.bb
@@ -0,0 +1,7 @@
+require bluez4-libs.inc
+
+PR = "${INC_PR}"
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
+DEFAULT_PREFERENCE_shr = "1"
diff --git a/recipes/bluez/bluez-utils-alsa_3.33.bb b/recipes/bluez/bluez-utils-alsa_3.33.bb
index 2558b8728a..de9406fdc5 100644
--- a/recipes/bluez/bluez-utils-alsa_3.33.bb
+++ b/recipes/bluez/bluez-utils-alsa_3.33.bb
@@ -1,4 +1,4 @@
-require bluez-utils3.inc
+require bluez-utils.inc
PR = "r1"
@@ -8,7 +8,7 @@ DEPENDS += "alsa-lib"
# albeit in a somewhat different form
SRC_URI += "file://hciattach-ti-bts.patch;patch=1"
-# see bluez-utils3.inc for the explanation of these option
+# see bluez-utils.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \
--disable-hid2hci \
diff --git a/recipes/bluez/bluez-utils-alsa_3.36.bb b/recipes/bluez/bluez-utils-alsa_3.36.bb
index c35eec04e0..0377dbe503 100644
--- a/recipes/bluez/bluez-utils-alsa_3.36.bb
+++ b/recipes/bluez/bluez-utils-alsa_3.36.bb
@@ -1,9 +1,9 @@
-require bluez-utils3.inc
+require bluez-utils.inc
DEPENDS += "alsa-lib"
-# see bluez-utils3.inc for the explanation of these option
+# see bluez-utils.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \
--disable-hid2hci \
diff --git a/recipes/bluez/bluez-utils.inc b/recipes/bluez/bluez-utils.inc
index 7c84f4e1d5..df071b76d9 100644
--- a/recipes/bluez/bluez-utils.inc
+++ b/recipes/bluez/bluez-utils.inc
@@ -1,67 +1,146 @@
DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
SECTION = "console"
PRIORITY = "optional"
-DEPENDS = "gstreamer gst-plugins-base bluez-libs-${PV} virtual/libusb0 dbus cups"
+DEPENDS = "gstreamer gst-plugins-base bluez-libs-${PV} virtual/libusb0 dbus glib-2.0"
PROVIDES = "bluez-utils-dbus"
RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
RREPLACES = "bluez-utils-dbus"
RCONFLICTS_${PN} = "bluez-utils-nodbus"
LICENSE = "GPL"
+FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
+
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
- file://hciattach-ti-bts.patch;patch=1 \
- file://handle-eintr.patch;patch=1;status=applied"
-SRC_URI_append_r1000 = " file://hciattach.sh"
-SRC_URI_append_ghi270 = " file://hciattach.sh"
+ file://hcid.conf \
+ file://sbc-thumb.patch;patch=1"
-# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
-# Let's default to that instead of 'any' until further notice...
-SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
S = "${WORKDIR}/bluez-utils-${PV}"
-EXTRA_OECONF = "--enable-initscripts --enable-bccmd --enable-bcm203x --enable-hid2hci --enable-cups"
+inherit autotools update-rc.d
+
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --enable-alsa \
+ --enable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+# The config options are explained below:
+
# --enable-obex enable OBEX support
-# --enable-alsa enable ALSA support
+# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
# --enable-cups install CUPS backend support
# --enable-bccmd install BCCMD interface utility
# --enable-avctrl install Audio/Video control utility
# --enable-hid2hci install HID mode switching utility
# --enable-dfutool install DFU firmware upgrade utility
-inherit autotools update-rc.d
+# --enable-glib For systems that use and install GLib anyway
+# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
+#Following services can be enabled so far:
+# --enable-network
+# --enable-serial
+# --enable-input
+# --enable-audio
+# --enable-echo
+
+#There is no need to modify any init script. They will be started
+#automatically or on demand. Only /etc/bluetooth/*.service files should
+#be patched to change name or the autostart value.
+# --enable-configfile
+# --enable-initscripts
+
+#For even smaller -doc packages
+# --disable-manpages
+# --disable-pcmciarules
+
+#I haven't seen any embedded device with HID proxy support. So simply
+#disable it:
+# --disable-hid2hci
+
+OE_LT_RPATH_ALLOW = "any"
+OE_LT_RPATH_ALLOW[export]="1"
do_install_append() {
install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/
- mv ${D}${sbindir}/* ${D}${base_sbindir}/
- mv ${D}${bindir}/* ${D}${base_bindir}/
- rmdir ${D}${bindir} ${D}${sbindir}
+ if [ "${sbindir}" != "${base_sbindir}" ]; then
+ mv ${D}${sbindir}/* ${D}${base_sbindir}/
+ rmdir ${D}${sbindir}
+ fi
+ if [ "${bindir}" != "${base_bindir}" ]; then
+ mv ${D}${bindir}/* ${D}${base_bindir}/
+ rmdir ${D}${bindir}
+ fi
chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
- install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/
+ install -m 0644 ${S}/rfcomm/rfcomm.conf ${D}${sysconfdir}/bluetooth/
+ install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/ ||true
+ install -m 0755 ${S}/test/.libs/passkey-agent ${D}${base_bindir}/ ||true
}
-do_install_append_r1000() {
- install -d ${D}${sysconfdir} ${D}${sysconfdir}/bluetooth
- install -m 0755 ${WORKDIR}/hciattach.sh ${D}${sysconfdir}/bluetooth/hciattach
-}
-do_install_append_ghi270() {
- install -d ${D}${sysconfdir} ${D}${sysconfdir}/bluetooth
- install -m 0755 ${WORKDIR}/hciattach.sh ${D}${sysconfdir}/bluetooth/hciattach
-}
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults 23 19"
+
+
+PACKAGES =+ "${PN}-compat"
+
+
+FILES_${PN} = " \
+ ${base_sbindir}/hcid \
+ ${libdir}/bluetooth \
+ ${sysconfdir}/init.d/bluetooth \
+ ${sysconfdir}/bluetooth/*.service \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default \
+ ${sysconfdir}/dbus-1 \
+ ${base_sbindir}/hciattach \
+ "
+
+FILES_${PN}-dbg += " \
+ ${libdir}/bluetooth/.debug \
+ ${libdir}/cups/backend/.debug \
+ ${libdir}/alsa-lib/.debug \
+ "
+
+FILES_${PN}-compat = " \
+ ${base_bindir}/sdptool \
+ ${base_bindir}/dund \
+ ${base_bindir}/rctest \
+ ${base_bindir}/ciptool \
+ ${base_bindir}/l2test \
+ ${base_bindir}/rfcomm \
+ ${base_bindir}/hcitool \
+ ${base_bindir}/pand \
+ ${base_bindir}/hidd \
+ ${base_bindir}/l2ping \
+ ${base_sbindir}/hciconfig \
+ ${base_sbindir}/bccmd \
+ ${base_sbindir}/hciemu \
+ ${base_sbindir}/hid2hci \
+ ${base_bindir}/passkey-agent \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+
+
+
+
+
+
-CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
- ${sysconfdir}/default/bluetooth"
-PACKAGES =+ " bluez-cups-backend"
-FILES_${PN} += " ${libdir}/alsa-lib/*.so "
-FILES_${PN}-dev += " ${libdir}/alsa-lib/*.la "
-FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
-RDEPENDS_bluez-cups-backend = "cups"
diff --git a/recipes/bluez/bluez-utils3.inc b/recipes/bluez/bluez-utils3.inc
deleted file mode 100644
index df071b76d9..0000000000
--- a/recipes/bluez/bluez-utils3.inc
+++ /dev/null
@@ -1,146 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
-SECTION = "console"
-PRIORITY = "optional"
-DEPENDS = "gstreamer gst-plugins-base bluez-libs-${PV} virtual/libusb0 dbus glib-2.0"
-PROVIDES = "bluez-utils-dbus"
-RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
-RREPLACES = "bluez-utils-dbus"
-RCONFLICTS_${PN} = "bluez-utils-nodbus"
-LICENSE = "GPL"
-
-FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf \
- file://sbc-thumb.patch;patch=1"
-
-
-S = "${WORKDIR}/bluez-utils-${PV}"
-
-inherit autotools update-rc.d
-
-EXTRA_OECONF = " \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-alsa \
- --enable-cups \
- --enable-glib \
- --disable-sdpd \
- --enable-network \
- --enable-serial \
- --enable-input \
- --enable-audio \
- --enable-echo \
- --enable-configfile \
- --enable-initscripts \
- --enable-test \
- "
-
-# The config options are explained below:
-
-# --enable-obex enable OBEX support
-# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
-# --enable-cups install CUPS backend support
-# --enable-bccmd install BCCMD interface utility
-# --enable-avctrl install Audio/Video control utility
-# --enable-hid2hci install HID mode switching utility
-# --enable-dfutool install DFU firmware upgrade utility
-
-# --enable-glib For systems that use and install GLib anyway
-# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
-
-#Following services can be enabled so far:
-# --enable-network
-# --enable-serial
-# --enable-input
-# --enable-audio
-# --enable-echo
-
-#There is no need to modify any init script. They will be started
-#automatically or on demand. Only /etc/bluetooth/*.service files should
-#be patched to change name or the autostart value.
-# --enable-configfile
-# --enable-initscripts
-
-#For even smaller -doc packages
-# --disable-manpages
-# --disable-pcmciarules
-
-#I haven't seen any embedded device with HID proxy support. So simply
-#disable it:
-# --disable-hid2hci
-
-OE_LT_RPATH_ALLOW = "any"
-OE_LT_RPATH_ALLOW[export]="1"
-
-do_install_append() {
- install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/
- if [ "${sbindir}" != "${base_sbindir}" ]; then
- mv ${D}${sbindir}/* ${D}${base_sbindir}/
- rmdir ${D}${sbindir}
- fi
- if [ "${bindir}" != "${base_bindir}" ]; then
- mv ${D}${bindir}/* ${D}${base_bindir}/
- rmdir ${D}${bindir}
- fi
- chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
- install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
- install -m 0644 ${S}/rfcomm/rfcomm.conf ${D}${sysconfdir}/bluetooth/
- install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/ ||true
- install -m 0755 ${S}/test/.libs/passkey-agent ${D}${base_bindir}/ ||true
-}
-
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
-
-
-PACKAGES =+ "${PN}-compat"
-
-
-FILES_${PN} = " \
- ${base_sbindir}/hcid \
- ${libdir}/bluetooth \
- ${sysconfdir}/init.d/bluetooth \
- ${sysconfdir}/bluetooth/*.service \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default \
- ${sysconfdir}/dbus-1 \
- ${base_sbindir}/hciattach \
- "
-
-FILES_${PN}-dbg += " \
- ${libdir}/bluetooth/.debug \
- ${libdir}/cups/backend/.debug \
- ${libdir}/alsa-lib/.debug \
- "
-
-FILES_${PN}-compat = " \
- ${base_bindir}/sdptool \
- ${base_bindir}/dund \
- ${base_bindir}/rctest \
- ${base_bindir}/ciptool \
- ${base_bindir}/l2test \
- ${base_bindir}/rfcomm \
- ${base_bindir}/hcitool \
- ${base_bindir}/pand \
- ${base_bindir}/hidd \
- ${base_bindir}/l2ping \
- ${base_sbindir}/hciconfig \
- ${base_sbindir}/bccmd \
- ${base_sbindir}/hciemu \
- ${base_sbindir}/hid2hci \
- ${base_bindir}/passkey-agent \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-
-
-
-
-
-
-
-
-
-
diff --git a/recipes/bluez/bluez-utils_3.33.bb b/recipes/bluez/bluez-utils_3.33.bb
index 322f84114f..cf6a74edd5 100644
--- a/recipes/bluez/bluez-utils_3.33.bb
+++ b/recipes/bluez/bluez-utils_3.33.bb
@@ -1,4 +1,4 @@
-require bluez-utils3.inc
+require bluez-utils.inc
PR = "r3"
@@ -6,7 +6,7 @@ PR = "r3"
# albeit in a somewhat different form
SRC_URI += "file://hciattach-ti-bts.patch;patch=1"
-# see bluez-utils3.inc for the explanation of these option
+# see bluez-utils.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \
--enable-hid2hci \
diff --git a/recipes/bluez/bluez-utils_3.36.bb b/recipes/bluez/bluez-utils_3.36.bb
index 20a9bad46c..b3badcc351 100644
--- a/recipes/bluez/bluez-utils_3.36.bb
+++ b/recipes/bluez/bluez-utils_3.36.bb
@@ -1,8 +1,8 @@
-require bluez-utils3.inc
+require bluez-utils.inc
PR = "r4"
-# see bluez-utils3.inc for the explanation of these option
+# see bluez-utils.inc for the explanation of these option
EXTRA_OECONF = " \
--enable-bccmd \
--enable-hid2hci \
diff --git a/recipes/bluez/bluez-utils_4.31.bb b/recipes/bluez/bluez-utils_4.31.bb
new file mode 100644
index 0000000000..6c12294cee
--- /dev/null
+++ b/recipes/bluez/bluez-utils_4.31.bb
@@ -0,0 +1,3 @@
+require bluez4-utils.inc
+
+PR = "${INC_PR}"
diff --git a/recipes/bluez/bluez-utils_4.35.bb b/recipes/bluez/bluez-utils_4.35.bb
new file mode 100644
index 0000000000..6c12294cee
--- /dev/null
+++ b/recipes/bluez/bluez-utils_4.35.bb
@@ -0,0 +1,3 @@
+require bluez4-utils.inc
+
+PR = "${INC_PR}"
diff --git a/recipes/bluez/bluez-utils_4.37.bb b/recipes/bluez/bluez-utils_4.37.bb
new file mode 100644
index 0000000000..6c12294cee
--- /dev/null
+++ b/recipes/bluez/bluez-utils_4.37.bb
@@ -0,0 +1,3 @@
+require bluez4-utils.inc
+
+PR = "${INC_PR}"
diff --git a/recipes/bluez/bluez-utils_4.39.bb b/recipes/bluez/bluez-utils_4.39.bb
new file mode 100644
index 0000000000..6c12294cee
--- /dev/null
+++ b/recipes/bluez/bluez-utils_4.39.bb
@@ -0,0 +1,3 @@
+require bluez4-utils.inc
+
+PR = "${INC_PR}"
diff --git a/recipes/bluez/bluez-utils_4.41.bb b/recipes/bluez/bluez-utils_4.41.bb
new file mode 100644
index 0000000000..6c12294cee
--- /dev/null
+++ b/recipes/bluez/bluez-utils_4.41.bb
@@ -0,0 +1,3 @@
+require bluez4-utils.inc
+
+PR = "${INC_PR}"
diff --git a/recipes/bluez/bluez-utils_4.42.bb b/recipes/bluez/bluez-utils_4.42.bb
new file mode 100644
index 0000000000..6c12294cee
--- /dev/null
+++ b/recipes/bluez/bluez-utils_4.42.bb
@@ -0,0 +1,3 @@
+require bluez4-utils.inc
+
+PR = "${INC_PR}"
diff --git a/recipes/bluez/bluez4_4.56.bb b/recipes/bluez/bluez-utils_4.47.bb
index 79e3005462..0d58066a26 100644
--- a/recipes/bluez/bluez4_4.56.bb
+++ b/recipes/bluez/bluez-utils_4.47.bb
@@ -1,16 +1,13 @@
-require bluez4.inc
+require bluez4-utils.inc
+
+PR = "${INC_PR}"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_angstrom = "1"
DEFAULT_PREFERENCE_shr = "1"
-DEPENDS += "libsndfile1"
-
-PR = "${INC_PR}.0"
-
# Not all distros have a recent enough udev
BTUDEV = " --disable-udevrules"
BTUDEV_angstrom = " --enable-udevrules"
-BTUDEV_shr = " --enable-udevrules"
+BTUDEV_shr = "—enable-udevrules"
EXTRA_OECONF += "${BTUDEV}"
-
diff --git a/recipes/bluez/bluez4_4.47.bb b/recipes/bluez/bluez-utils_4.53.bb
index 8f5c6e8f7c..0d58066a26 100644
--- a/recipes/bluez/bluez4_4.47.bb
+++ b/recipes/bluez/bluez-utils_4.53.bb
@@ -1,13 +1,13 @@
-require bluez4.inc
+require bluez4-utils.inc
+
+PR = "${INC_PR}"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_angstrom = "1"
-
-DEPENDS += "libsndfile1"
-PR = "${INC_PR}.1"
+DEFAULT_PREFERENCE_shr = "1"
# Not all distros have a recent enough udev
BTUDEV = " --disable-udevrules"
BTUDEV_angstrom = " --enable-udevrules"
+BTUDEV_shr = "—enable-udevrules"
EXTRA_OECONF += "${BTUDEV}"
-
diff --git a/recipes/bluez/bluez4_4.53.bb b/recipes/bluez/bluez-utils_4.56.bb
index ad2c957bfc..0d58066a26 100644
--- a/recipes/bluez/bluez4_4.53.bb
+++ b/recipes/bluez/bluez-utils_4.56.bb
@@ -1,14 +1,13 @@
-require bluez4.inc
+require bluez4-utils.inc
+
+PR = "${INC_PR}"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_angstrom = "1"
-
-DEPENDS += "libsndfile1"
-
-PR = "${INC_PR}.0"
+DEFAULT_PREFERENCE_shr = "1"
# Not all distros have a recent enough udev
BTUDEV = " --disable-udevrules"
BTUDEV_angstrom = " --enable-udevrules"
+BTUDEV_shr = "—enable-udevrules"
EXTRA_OECONF += "${BTUDEV}"
-
diff --git a/recipes/bluez/bluez.inc b/recipes/bluez/bluez.inc
deleted file mode 100644
index e4202f3bd5..0000000000
--- a/recipes/bluez/bluez.inc
+++ /dev/null
@@ -1,95 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland Utilities and libraries."
-SECTION = "console"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.bluez.org"
-LICENSE = "GPL"
-PR = "r0"
-
-DEPENDS = "gstreamer gst-plugins-base dbus glib-2.0"
-PROVIDES = "bluez-utils-dbus"
-RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
-RREPLACES = "bluez-utils-dbus"
-RCONFLICTS_${PN} = "bluez-utils-nodbus"
-
-FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
-
-S = "${WORKDIR}/bluez-${PV}"
-
-inherit autotools update-rc.d pkgconfig
-
-OE_LT_RPATH_ALLOW = "any"
-OE_LT_RPATH_ALLOW[export]="1"
-
-do_install_append() {
- install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/
- if [ "${sbindir}" != "${base_sbindir}" ]; then
- mv ${D}${sbindir}/* ${D}${base_sbindir}/
- rmdir ${D}${sbindir}
- fi
- if [ "${bindir}" != "${base_bindir}" ]; then
- mv ${D}${bindir}/* ${D}${base_bindir}/
- rmdir ${D}${bindir}
- fi
- chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
- install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
- install -m 0644 ${S}/rfcomm/rfcomm.conf ${D}${sysconfdir}/bluetooth/
- install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/ ||true
- install -m 0755 ${S}/test/.libs/passkey-agent ${D}${base_bindir}/ ||true
-}
-
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
-
-
-PACKAGES =+ "${PN}-compat"
-
-
-FILES_${PN} = " \
- ${base_sbindir}/hcid \
- ${libdir}/bluetooth \
- ${sysconfdir}/init.d/bluetooth \
- ${sysconfdir}/bluetooth/*.service \
- ${sysconfdir}/bluetooth/hcid.conf \
- ${sysconfdir}/default \
- ${sysconfdir}/dbus-1 \
- ${base_sbindir}/hciattach \
- "
-
-FILES_${PN}-dbg += " \
- ${libdir}/bluetooth/.debug \
- ${libdir}/cups/backend/.debug \
- ${libdir}/alsa-lib/.debug \
- "
-
-FILES_${PN}-compat = " \
- ${base_bindir}/sdptool \
- ${base_bindir}/dund \
- ${base_bindir}/rctest \
- ${base_bindir}/ciptool \
- ${base_bindir}/l2test \
- ${base_bindir}/rfcomm \
- ${base_bindir}/hcitool \
- ${base_bindir}/pand \
- ${base_bindir}/hidd \
- ${base_bindir}/l2ping \
- ${base_sbindir}/hciconfig \
- ${base_sbindir}/bccmd \
- ${base_sbindir}/hciemu \
- ${base_sbindir}/hid2hci \
- ${base_bindir}/passkey-agent \
- ${sysconfdir}/bluetooth/rfcomm.conf \
- "
-
-HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
-
-do_stage_prepend() {
- oe_libinstall -so -C lib libbluetooth ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/bluetooth/
- for f in ${HEADERS}
- do
- install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
- done
-}
-
diff --git a/recipes/bluez/bluez4-4.31/avinfo-link.patch b/recipes/bluez/bluez4-4.31/avinfo-link.patch
new file mode 100644
index 0000000000..27466f17b0
--- /dev/null
+++ b/recipes/bluez/bluez4-4.31/avinfo-link.patch
@@ -0,0 +1,22 @@
+--- tools/Makefile.am
++++ tools/Makefile.am
+@@ -1,8 +1,10 @@
+
+ if TOOLS
++avinfo_programs = avinfo
+ tools_programs = hcitool l2ping sdptool ciptool
+ tools_manfiles = hcitool.1 l2ping.1 sdptool.1 ciptool.1
+ else
++avinfo_programs =
+ tools_programs =
+ tools_manfiles =
+ endif
+@@ -41,7 +43,7 @@ sbin_PROGRAMS = hciattach hciconfig $(bccmd_programs) $(avctrl_programs) $(hid2h
+
+ bin_PROGRAMS = $(tools_programs) $(dfutool_programs) $(dfubabel_programs)
+
+-noinst_PROGRAMS = hcisecfilter ppporc avinfo $(usb_programs)
++noinst_PROGRAMS = hcisecfilter ppporc $(avinfo_programs) $(usb_programs)
+
+ hciattach_SOURCES = hciattach.c hciattach.h \
+ hciattach_st.c hciattach_ti.c hciattach_tialt.c
diff --git a/recipes/bluez/bluez4-4.35/avinfo-link.patch b/recipes/bluez/bluez4-4.35/avinfo-link.patch
new file mode 100644
index 0000000000..27466f17b0
--- /dev/null
+++ b/recipes/bluez/bluez4-4.35/avinfo-link.patch
@@ -0,0 +1,22 @@
+--- tools/Makefile.am
++++ tools/Makefile.am
+@@ -1,8 +1,10 @@
+
+ if TOOLS
++avinfo_programs = avinfo
+ tools_programs = hcitool l2ping sdptool ciptool
+ tools_manfiles = hcitool.1 l2ping.1 sdptool.1 ciptool.1
+ else
++avinfo_programs =
+ tools_programs =
+ tools_manfiles =
+ endif
+@@ -41,7 +43,7 @@ sbin_PROGRAMS = hciattach hciconfig $(bccmd_programs) $(avctrl_programs) $(hid2h
+
+ bin_PROGRAMS = $(tools_programs) $(dfutool_programs) $(dfubabel_programs)
+
+-noinst_PROGRAMS = hcisecfilter ppporc avinfo $(usb_programs)
++noinst_PROGRAMS = hcisecfilter ppporc $(avinfo_programs) $(usb_programs)
+
+ hciattach_SOURCES = hciattach.c hciattach.h \
+ hciattach_st.c hciattach_ti.c hciattach_tialt.c
diff --git a/recipes/bluez/bluez4-4.37/avinfo-link.patch b/recipes/bluez/bluez4-4.37/avinfo-link.patch
new file mode 100644
index 0000000000..27466f17b0
--- /dev/null
+++ b/recipes/bluez/bluez4-4.37/avinfo-link.patch
@@ -0,0 +1,22 @@
+--- tools/Makefile.am
++++ tools/Makefile.am
+@@ -1,8 +1,10 @@
+
+ if TOOLS
++avinfo_programs = avinfo
+ tools_programs = hcitool l2ping sdptool ciptool
+ tools_manfiles = hcitool.1 l2ping.1 sdptool.1 ciptool.1
+ else
++avinfo_programs =
+ tools_programs =
+ tools_manfiles =
+ endif
+@@ -41,7 +43,7 @@ sbin_PROGRAMS = hciattach hciconfig $(bccmd_programs) $(avctrl_programs) $(hid2h
+
+ bin_PROGRAMS = $(tools_programs) $(dfutool_programs) $(dfubabel_programs)
+
+-noinst_PROGRAMS = hcisecfilter ppporc avinfo $(usb_programs)
++noinst_PROGRAMS = hcisecfilter ppporc $(avinfo_programs) $(usb_programs)
+
+ hciattach_SOURCES = hciattach.c hciattach.h \
+ hciattach_st.c hciattach_ti.c hciattach_tialt.c
diff --git a/recipes/bluez/bluez4-4.39/avinfo-link.patch b/recipes/bluez/bluez4-4.39/avinfo-link.patch
new file mode 100644
index 0000000000..27466f17b0
--- /dev/null
+++ b/recipes/bluez/bluez4-4.39/avinfo-link.patch
@@ -0,0 +1,22 @@
+--- tools/Makefile.am
++++ tools/Makefile.am
+@@ -1,8 +1,10 @@
+
+ if TOOLS
++avinfo_programs = avinfo
+ tools_programs = hcitool l2ping sdptool ciptool
+ tools_manfiles = hcitool.1 l2ping.1 sdptool.1 ciptool.1
+ else
++avinfo_programs =
+ tools_programs =
+ tools_manfiles =
+ endif
+@@ -41,7 +43,7 @@ sbin_PROGRAMS = hciattach hciconfig $(bccmd_programs) $(avctrl_programs) $(hid2h
+
+ bin_PROGRAMS = $(tools_programs) $(dfutool_programs) $(dfubabel_programs)
+
+-noinst_PROGRAMS = hcisecfilter ppporc avinfo $(usb_programs)
++noinst_PROGRAMS = hcisecfilter ppporc $(avinfo_programs) $(usb_programs)
+
+ hciattach_SOURCES = hciattach.c hciattach.h \
+ hciattach_st.c hciattach_ti.c hciattach_tialt.c
diff --git a/recipes/bluez/bluez4-4.47/avinfo-link.patch b/recipes/bluez/bluez4-4.47/avinfo-link.patch
new file mode 100644
index 0000000000..be0e188312
--- /dev/null
+++ b/recipes/bluez/bluez4-4.47/avinfo-link.patch
@@ -0,0 +1,26 @@
+---
+ tools/Makefile.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- tools/Makefile.am.orig
++++ tools/Makefile.am
+@@ -1,8 +1,10 @@
+
+ if TOOLS
++avinfo_programs = avinfo
+ tools_programs = l2ping hcitool sdptool ciptool
+ tools_manfiles = l2ping.8 hcitool.1 sdptool.1 ciptool.1
+ else
++avinfo_programs =
+ tools_programs =
+ tools_manfiles =
+ endif
+@@ -41,7 +43,7 @@ sbin_PROGRAMS = hciattach hciconfig $(bc
+
+ bin_PROGRAMS = $(tools_programs) $(dfutool_programs) $(dfubabel_programs)
+
+-noinst_PROGRAMS = hcieventmask hcisecfilter ppporc avinfo $(usb_programs)
++noinst_PROGRAMS = hcieventmask hcisecfilter ppporc $(avinfo_programs) $(usb_programs)
+
+ hcieventmask_LDADD = @BLUEZ_LIBS@
+
diff --git a/recipes/bluez/bluez4-4.53/avinfo-link.patch b/recipes/bluez/bluez4-4.53/avinfo-link.patch
new file mode 100644
index 0000000000..be0e188312
--- /dev/null
+++ b/recipes/bluez/bluez4-4.53/avinfo-link.patch
@@ -0,0 +1,26 @@
+---
+ tools/Makefile.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- tools/Makefile.am.orig
++++ tools/Makefile.am
+@@ -1,8 +1,10 @@
+
+ if TOOLS
++avinfo_programs = avinfo
+ tools_programs = l2ping hcitool sdptool ciptool
+ tools_manfiles = l2ping.8 hcitool.1 sdptool.1 ciptool.1
+ else
++avinfo_programs =
+ tools_programs =
+ tools_manfiles =
+ endif
+@@ -41,7 +43,7 @@ sbin_PROGRAMS = hciattach hciconfig $(bc
+
+ bin_PROGRAMS = $(tools_programs) $(dfutool_programs) $(dfubabel_programs)
+
+-noinst_PROGRAMS = hcieventmask hcisecfilter ppporc avinfo $(usb_programs)
++noinst_PROGRAMS = hcieventmask hcisecfilter ppporc $(avinfo_programs) $(usb_programs)
+
+ hcieventmask_LDADD = @BLUEZ_LIBS@
+
diff --git a/recipes/bluez/bluez4-4.53/separate-libs.patch b/recipes/bluez/bluez4-4.53/separate-libs.patch
new file mode 100644
index 0000000000..aec1fd2fd5
--- /dev/null
+++ b/recipes/bluez/bluez4-4.53/separate-libs.patch
@@ -0,0 +1,251 @@
+From 4edc7da4dd2a3c6d52325ace2cf6c91117c97815 Mon Sep 17 00:00:00 2001
+From: Chris Larson <clarson@mvista.com>
+Date: Fri, 15 Jan 2010 13:51:44 -0700
+Subject: [PATCH] Build against external libbluetooth.
+
+Signed-off-by: Chris Larson <clarson@mvista.com>
+---
+ Makefile.am | 12 +++++++-----
+ Makefile.tools | 52 ++++++++++++++++++++++++++--------------------------
+ acinclude.m4 | 11 +++++++++++
+ configure.ac | 1 +
+ 4 files changed, 45 insertions(+), 31 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 0226554..43d50c9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -49,12 +49,14 @@ local_headers = $(foreach file,$(lib_headers), lib/bluetooth/$(notdir $(file)))
+
+ include_HEADERS += $(lib_headers)
+
++if !EXTERNAL_BTLIB
+ lib_LTLIBRARIES += lib/libbluetooth.la
+
+ lib_libbluetooth_la_SOURCES = $(lib_headers) \
+ lib/bluetooth.c lib/hci.c lib/sdp.c
+ lib_libbluetooth_la_LDFLAGS = -version-info 7:0:4
+ lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
++endif
+
+ CLEANFILES += $(local_headers)
+
+@@ -191,7 +193,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
+ src/device.h src/device.c \
+ src/dbus-common.c src/dbus-common.h \
+ src/dbus-hci.h src/dbus-hci.c
+-src_bluetoothd_LDADD = lib/libbluetooth.la @GLIB_LIBS@ @DBUS_LIBS@ -ldl
++src_bluetoothd_LDADD = @BLUEZ_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ -ldl
+ src_bluetoothd_LDFLAGS = -Wl,--export-dynamic \
+ -Wl,--version-script=src/bluetooth.ver
+ src_bluetoothd_DEPENDENCIES = src/bluetooth.ver
+@@ -225,13 +227,13 @@ audio_libasound_module_pcm_bluetooth_la_SOURCES = audio/pcm_bluetooth.c \
+ audio/rtp.h audio/ipc.h audio/ipc.c
+ audio_libasound_module_pcm_bluetooth_la_LDFLAGS = -module -avoid-version #-export-symbols-regex [_]*snd_pcm_.*
+ audio_libasound_module_pcm_bluetooth_la_LIBADD = sbc/libsbc.la \
+- lib/libbluetooth.la @ALSA_LIBS@
++ @BLUEZ_LIBS@ @ALSA_LIBS@
+ audio_libasound_module_pcm_bluetooth_la_CFLAGS = @ALSA_CFLAGS@
+
+ audio_libasound_module_ctl_bluetooth_la_SOURCES = audio/ctl_bluetooth.c \
+ audio/rtp.h audio/ipc.h audio/ipc.c
+ audio_libasound_module_ctl_bluetooth_la_LDFLAGS = -module -avoid-version #-export-symbols-regex [_]*snd_ctl_.*
+-audio_libasound_module_ctl_bluetooth_la_LIBADD = lib/libbluetooth.la @ALSA_LIBS@
++audio_libasound_module_ctl_bluetooth_la_LIBADD = @BLUEZ_LIBS@ @ALSA_LIBS@
+ audio_libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@
+
+ if CONFIGFILES
+@@ -257,7 +259,7 @@ audio_libgstbluetooth_la_SOURCES = audio/gstbluetooth.c \
+ audio/gstrtpsbcpay.h audio/gstrtpsbcpay.c \
+ audio/rtp.h audio/ipc.h audio/ipc.c
+ audio_libgstbluetooth_la_LDFLAGS = -module -avoid-version
+-audio_libgstbluetooth_la_LIBADD = sbc/libsbc.la lib/libbluetooth.la \
++audio_libgstbluetooth_la_LIBADD = sbc/libsbc.la @BLUEZ_LIBS@ \
+ @GSTREAMER_LIBS@ -lgstaudio-0.10 -lgstrtp-0.10
+ audio_libgstbluetooth_la_CFLAGS = -fvisibility=hidden -fno-strict-aliasing \
+ $(AM_CFLAGS) @GSTREAMER_CFLAGS@
+@@ -307,7 +309,7 @@ AM_YFLAGS = -d
+ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \
+ -DBLUETOOTH_PLUGIN_BUILTIN -DPLUGINDIR=\""$(plugindir)"\"
+
+-INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
++INCLUDES = @BLUEZ_CFLAGS@ -I$(builddir)/src -I$(srcdir)/src \
+ -I$(srcdir)/audio -I$(srcdir)/sbc -I$(srcdir)/gdbus
+
+
+diff --git a/Makefile.tools b/Makefile.tools
+index 70bfb1b..d2696cd 100644
+--- a/Makefile.tools
++++ b/Makefile.tools
+@@ -16,34 +16,34 @@ tools_rfcomm_SOURCES = tools/main.c tools/parser.y tools/lexer.l \
+ tools/kword.h tools/kword.c
+ EXTRA_tools_rfcomm_SOURCES = tools/parser.h tools/parser.c \
+ tools/lexer.c
+-tools_rfcomm_LDADD = lib/libbluetooth.la
++tools_rfcomm_LDADD = @BLUEZ_LIBS@
+
+-tools_l2ping_LDADD = lib/libbluetooth.la
++tools_l2ping_LDADD = @BLUEZ_LIBS@
+
+ tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
+ tools/hciattach_st.c \
+ tools/hciattach_ti.c \
+ tools/hciattach_tialt.c
+-tools_hciattach_LDADD = lib/libbluetooth.la
++tools_hciattach_LDADD = @BLUEZ_LIBS@
+
+ tools_hciconfig_SOURCES = tools/hciconfig.c tools/csr.h tools/csr.c \
+ src/textfile.h src/textfile.c
+-tools_hciconfig_LDADD = lib/libbluetooth.la
++tools_hciconfig_LDADD = @BLUEZ_LIBS@
+
+ tools_hcitool_SOURCES = tools/hcitool.c src/oui.h src/oui.c \
+ src/textfile.h src/textfile.c
+-tools_hcitool_LDADD = lib/libbluetooth.la
++tools_hcitool_LDADD = @BLUEZ_LIBS@
+
+ tools_sdptool_SOURCES = tools/sdptool.c src/sdp-xml.h src/sdp-xml.c
+-tools_sdptool_LDADD = lib/libbluetooth.la
++tools_sdptool_LDADD = @BLUEZ_LIBS@
+
+-tools_ciptool_LDADD = lib/libbluetooth.la
++tools_ciptool_LDADD = @BLUEZ_LIBS@
+
+-tools_avinfo_LDADD = lib/libbluetooth.la
++tools_avinfo_LDADD = @BLUEZ_LIBS@
+
+-tools_ppporc_LDADD = lib/libbluetooth.la
++tools_ppporc_LDADD = @BLUEZ_LIBS@
+
+-tools_hcieventmask_LDADD = lib/libbluetooth.la
++tools_hcieventmask_LDADD = @BLUEZ_LIBS@
+
+ dist_man_MANS += tools/rfcomm.1 tools/l2ping.8 \
+ tools/hciattach.8 tools/hciconfig.8 \
+@@ -65,7 +65,7 @@ sbin_PROGRAMS += tools/bccmd
+ tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \
+ tools/csr_hci.c tools/csr_h4.c tools/csr_3wire.c \
+ tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
+-tools_bccmd_LDADD = lib/libbluetooth.la
++tools_bccmd_LDADD = @BLUEZ_LIBS@
+
+ if USB
+ tools_bccmd_SOURCES += tools/csr_usb.c
+@@ -118,7 +118,7 @@ cups_PROGRAMS = cups/bluetooth
+ cups_bluetooth_SOURCES = $(gdbus_sources) cups/main.c cups/cups.h \
+ cups/sdp.c cups/spp.c cups/hcrp.c
+
+-cups_bluetooth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ lib/libbluetooth.la
++cups_bluetooth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
+ endif
+
+
+@@ -132,36 +132,36 @@ noinst_PROGRAMS += test/gaptest test/sdptest test/scotest \
+ test/lmptest test/bdaddr test/agent \
+ test/btiotest test/test-textfile
+
+-test_hciemu_LDADD = @GLIB_LIBS@ lib/libbluetooth.la
++test_hciemu_LDADD = @GLIB_LIBS@ @BLUEZ_LIBS@
+
+-test_l2test_LDADD = lib/libbluetooth.la
++test_l2test_LDADD = @BLUEZ_LIBS@
+
+-test_rctest_LDADD = lib/libbluetooth.la
++test_rctest_LDADD = @BLUEZ_LIBS@
+
+ test_gaptest_LDADD = @DBUS_LIBS@
+
+-test_sdptest_LDADD = lib/libbluetooth.la
++test_sdptest_LDADD = @BLUEZ_LIBS@
+
+-test_scotest_LDADD = lib/libbluetooth.la
++test_scotest_LDADD = @BLUEZ_LIBS@
+
+-test_attest_LDADD = lib/libbluetooth.la
++test_attest_LDADD = @BLUEZ_LIBS@
+
+-test_hstest_LDADD = lib/libbluetooth.la
++test_hstest_LDADD = @BLUEZ_LIBS@
+
+-test_avtest_LDADD = lib/libbluetooth.la
++test_avtest_LDADD = @BLUEZ_LIBS@
+
+-test_lmptest_LDADD = lib/libbluetooth.la
++test_lmptest_LDADD = @BLUEZ_LIBS@
+
+ test_ipctest_SOURCES = test/ipctest.c audio/ipc.h audio/ipc.c
+ test_ipctest_LDADD= @GLIB_LIBS@ sbc/libsbc.la
+
+ test_bdaddr_SOURCES = test/bdaddr.c src/oui.h src/oui.c
+-test_bdaddr_LDADD = lib/libbluetooth.la
++test_bdaddr_LDADD = @BLUEZ_LIBS@
+
+ test_agent_LDADD = @DBUS_LIBS@
+
+ test_btiotest_SOURCES = test/btiotest.c src/btio.h src/btio.c
+-test_btiotest_LDADD = @GLIB_LIBS@ lib/libbluetooth.la
++test_btiotest_LDADD = @GLIB_LIBS@ @BLUEZ_LIBS@
+
+ test_test_textfile_SOURCES = test/test-textfile.c src/textfile.h src/textfile.c
+
+@@ -187,7 +187,7 @@ bin_PROGRAMS += compat/hidd
+ compat_hidd_SOURCES = compat/hidd.c compat/hidd.h src/uinput.h \
+ compat/sdp.h compat/sdp.c compat/fakehid.c \
+ src/textfile.h src/textfile.c
+-compat_hidd_LDADD = -lm lib/libbluetooth.la
++compat_hidd_LDADD = -lm @BLUEZ_LIBS@
+
+ dist_man_MANS += compat/hidd.1
+ else
+@@ -200,7 +200,7 @@ bin_PROGRAMS += compat/pand
+ compat_pand_SOURCES = compat/pand.c compat/pand.h \
+ compat/bnep.c compat/sdp.h compat/sdp.c \
+ src/textfile.h src/textfile.c
+-compat_pand_LDADD = lib/libbluetooth.la
++compat_pand_LDADD = @BLUEZ_LIBS@
+
+ dist_man_MANS += compat/pand.1
+ else
+@@ -213,7 +213,7 @@ bin_PROGRAMS += compat/dund
+ compat_dund_SOURCES = compat/dund.c compat/dund.h compat/lib.h \
+ compat/sdp.h compat/sdp.c compat/dun.c compat/msdun.c \
+ src/textfile.h src/textfile.c
+-compat_dund_LDADD = lib/libbluetooth.la
++compat_dund_LDADD = @BLUEZ_LIBS@
+
+ dist_man_MANS += compat/dund.1
+ else
+diff --git a/acinclude.m4 b/acinclude.m4
+index 44f7c72..18b79fd 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -336,3 +336,14 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
+ AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")
+ ])
++
++AC_DEFUN([AC_PATH_BLUEZ], [
++ PKG_CHECK_MODULES(BLUEZ, bluez = $PACKAGE_VERSION, [found_bluez=yes], [found_bluez=no])
++ if test "${found_bluez}" = "no"; then
++ BLUEZ_CFLAGS="-I\$(builddir)/lib"
++ BLUEZ_LIBS="-Llib -lbluetooth"
++ fi
++ AC_SUBST(BLUEZ_CFLAGS)
++ AC_SUBST(BLUEZ_LIBS)
++ AM_CONDITIONAL(EXTERNAL_BTLIB, test "${found_bluez}" = "yes")
++])
+diff --git a/configure.ac b/configure.ac
+index d4910a1..71c4335 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,6 +35,7 @@ AC_FUNC_PPOLL
+ AC_CHECK_LIB(dl, dlopen, dummy=yes,
+ AC_MSG_ERROR(dynamic linking loader is required))
+
++AC_PATH_BLUEZ
+ AC_PATH_DBUS
+ AC_PATH_GLIB
+ AC_PATH_ALSA
+--
+1.6.4.339.g527d
+
diff --git a/recipes/bluez/bluez4-4.56/avinfo-link.patch b/recipes/bluez/bluez4-4.56/avinfo-link.patch
new file mode 100644
index 0000000000..be0e188312
--- /dev/null
+++ b/recipes/bluez/bluez4-4.56/avinfo-link.patch
@@ -0,0 +1,26 @@
+---
+ tools/Makefile.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- tools/Makefile.am.orig
++++ tools/Makefile.am
+@@ -1,8 +1,10 @@
+
+ if TOOLS
++avinfo_programs = avinfo
+ tools_programs = l2ping hcitool sdptool ciptool
+ tools_manfiles = l2ping.8 hcitool.1 sdptool.1 ciptool.1
+ else
++avinfo_programs =
+ tools_programs =
+ tools_manfiles =
+ endif
+@@ -41,7 +43,7 @@ sbin_PROGRAMS = hciattach hciconfig $(bc
+
+ bin_PROGRAMS = $(tools_programs) $(dfutool_programs) $(dfubabel_programs)
+
+-noinst_PROGRAMS = hcieventmask hcisecfilter ppporc avinfo $(usb_programs)
++noinst_PROGRAMS = hcieventmask hcisecfilter ppporc $(avinfo_programs) $(usb_programs)
+
+ hcieventmask_LDADD = @BLUEZ_LIBS@
+
diff --git a/recipes/bluez/bluez4-4.56/separate-libs.patch b/recipes/bluez/bluez4-4.56/separate-libs.patch
new file mode 100644
index 0000000000..e59b2b3351
--- /dev/null
+++ b/recipes/bluez/bluez4-4.56/separate-libs.patch
@@ -0,0 +1,251 @@
+From d21829b9140ccb7c24046dcd600a748ebc1cfe12 Mon Sep 17 00:00:00 2001
+From: Chris Larson <clarson@mvista.com>
+Date: Fri, 15 Jan 2010 13:51:44 -0700
+Subject: [PATCH] Build against external libbluetooth.
+
+Signed-off-by: Chris Larson <clarson@mvista.com>
+---
+ Makefile.am | 12 +++++++-----
+ Makefile.tools | 52 ++++++++++++++++++++++++++--------------------------
+ acinclude.m4 | 11 +++++++++++
+ configure.ac | 1 +
+ 4 files changed, 45 insertions(+), 31 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d360acb..74e136b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -49,12 +49,14 @@ local_headers = $(foreach file,$(lib_headers), lib/bluetooth/$(notdir $(file)))
+
+ include_HEADERS += $(lib_headers)
+
++if !EXTERNAL_BTLIB
+ lib_LTLIBRARIES += lib/libbluetooth.la
+
+ lib_libbluetooth_la_SOURCES = $(lib_headers) \
+ lib/bluetooth.c lib/hci.c lib/sdp.c
+ lib_libbluetooth_la_LDFLAGS = -version-info 7:2:4
+ lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
++endif
+
+ CLEANFILES += $(local_headers)
+
+@@ -191,7 +193,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
+ src/device.h src/device.c \
+ src/dbus-common.c src/dbus-common.h \
+ src/dbus-hci.h src/dbus-hci.c
+-src_bluetoothd_LDADD = lib/libbluetooth.la @GLIB_LIBS@ @DBUS_LIBS@ \
++src_bluetoothd_LDADD = @BLUEZ_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ \
+ @CAPNG_LIBS@ -ldl
+ src_bluetoothd_LDFLAGS = -Wl,--export-dynamic \
+ -Wl,--version-script=src/bluetooth.ver
+@@ -226,13 +228,13 @@ audio_libasound_module_pcm_bluetooth_la_SOURCES = audio/pcm_bluetooth.c \
+ audio/rtp.h audio/ipc.h audio/ipc.c
+ audio_libasound_module_pcm_bluetooth_la_LDFLAGS = -module -avoid-version #-export-symbols-regex [_]*snd_pcm_.*
+ audio_libasound_module_pcm_bluetooth_la_LIBADD = sbc/libsbc.la \
+- lib/libbluetooth.la @ALSA_LIBS@
++ @BLUEZ_LIBS@ @ALSA_LIBS@
+ audio_libasound_module_pcm_bluetooth_la_CFLAGS = @ALSA_CFLAGS@
+
+ audio_libasound_module_ctl_bluetooth_la_SOURCES = audio/ctl_bluetooth.c \
+ audio/rtp.h audio/ipc.h audio/ipc.c
+ audio_libasound_module_ctl_bluetooth_la_LDFLAGS = -module -avoid-version #-export-symbols-regex [_]*snd_ctl_.*
+-audio_libasound_module_ctl_bluetooth_la_LIBADD = lib/libbluetooth.la @ALSA_LIBS@
++audio_libasound_module_ctl_bluetooth_la_LIBADD = @BLUEZ_LIBS@ @ALSA_LIBS@
+ audio_libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@
+
+ if CONFIGFILES
+@@ -258,7 +260,7 @@ audio_libgstbluetooth_la_SOURCES = audio/gstbluetooth.c \
+ audio/gstrtpsbcpay.h audio/gstrtpsbcpay.c \
+ audio/rtp.h audio/ipc.h audio/ipc.c
+ audio_libgstbluetooth_la_LDFLAGS = -module -avoid-version
+-audio_libgstbluetooth_la_LIBADD = sbc/libsbc.la lib/libbluetooth.la \
++audio_libgstbluetooth_la_LIBADD = sbc/libsbc.la @BLUEZ_LIBS@ \
+ @GSTREAMER_LIBS@ -lgstaudio-0.10 -lgstrtp-0.10
+ audio_libgstbluetooth_la_CFLAGS = -fvisibility=hidden -fno-strict-aliasing \
+ $(AM_CFLAGS) @GSTREAMER_CFLAGS@
+@@ -308,7 +310,7 @@ AM_YFLAGS = -d
+ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ \
+ -DBLUETOOTH_PLUGIN_BUILTIN -DPLUGINDIR=\""$(plugindir)"\"
+
+-INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
++INCLUDES = @BLUEZ_CFLAGS@ -I$(builddir)/src -I$(srcdir)/src \
+ -I$(srcdir)/audio -I$(srcdir)/sbc -I$(srcdir)/gdbus
+
+
+diff --git a/Makefile.tools b/Makefile.tools
+index 70bfb1b..d2696cd 100644
+--- a/Makefile.tools
++++ b/Makefile.tools
+@@ -16,34 +16,34 @@ tools_rfcomm_SOURCES = tools/main.c tools/parser.y tools/lexer.l \
+ tools/kword.h tools/kword.c
+ EXTRA_tools_rfcomm_SOURCES = tools/parser.h tools/parser.c \
+ tools/lexer.c
+-tools_rfcomm_LDADD = lib/libbluetooth.la
++tools_rfcomm_LDADD = @BLUEZ_LIBS@
+
+-tools_l2ping_LDADD = lib/libbluetooth.la
++tools_l2ping_LDADD = @BLUEZ_LIBS@
+
+ tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
+ tools/hciattach_st.c \
+ tools/hciattach_ti.c \
+ tools/hciattach_tialt.c
+-tools_hciattach_LDADD = lib/libbluetooth.la
++tools_hciattach_LDADD = @BLUEZ_LIBS@
+
+ tools_hciconfig_SOURCES = tools/hciconfig.c tools/csr.h tools/csr.c \
+ src/textfile.h src/textfile.c
+-tools_hciconfig_LDADD = lib/libbluetooth.la
++tools_hciconfig_LDADD = @BLUEZ_LIBS@
+
+ tools_hcitool_SOURCES = tools/hcitool.c src/oui.h src/oui.c \
+ src/textfile.h src/textfile.c
+-tools_hcitool_LDADD = lib/libbluetooth.la
++tools_hcitool_LDADD = @BLUEZ_LIBS@
+
+ tools_sdptool_SOURCES = tools/sdptool.c src/sdp-xml.h src/sdp-xml.c
+-tools_sdptool_LDADD = lib/libbluetooth.la
++tools_sdptool_LDADD = @BLUEZ_LIBS@
+
+-tools_ciptool_LDADD = lib/libbluetooth.la
++tools_ciptool_LDADD = @BLUEZ_LIBS@
+
+-tools_avinfo_LDADD = lib/libbluetooth.la
++tools_avinfo_LDADD = @BLUEZ_LIBS@
+
+-tools_ppporc_LDADD = lib/libbluetooth.la
++tools_ppporc_LDADD = @BLUEZ_LIBS@
+
+-tools_hcieventmask_LDADD = lib/libbluetooth.la
++tools_hcieventmask_LDADD = @BLUEZ_LIBS@
+
+ dist_man_MANS += tools/rfcomm.1 tools/l2ping.8 \
+ tools/hciattach.8 tools/hciconfig.8 \
+@@ -65,7 +65,7 @@ sbin_PROGRAMS += tools/bccmd
+ tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \
+ tools/csr_hci.c tools/csr_h4.c tools/csr_3wire.c \
+ tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
+-tools_bccmd_LDADD = lib/libbluetooth.la
++tools_bccmd_LDADD = @BLUEZ_LIBS@
+
+ if USB
+ tools_bccmd_SOURCES += tools/csr_usb.c
+@@ -118,7 +118,7 @@ cups_PROGRAMS = cups/bluetooth
+ cups_bluetooth_SOURCES = $(gdbus_sources) cups/main.c cups/cups.h \
+ cups/sdp.c cups/spp.c cups/hcrp.c
+
+-cups_bluetooth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ lib/libbluetooth.la
++cups_bluetooth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
+ endif
+
+
+@@ -132,36 +132,36 @@ noinst_PROGRAMS += test/gaptest test/sdptest test/scotest \
+ test/lmptest test/bdaddr test/agent \
+ test/btiotest test/test-textfile
+
+-test_hciemu_LDADD = @GLIB_LIBS@ lib/libbluetooth.la
++test_hciemu_LDADD = @GLIB_LIBS@ @BLUEZ_LIBS@
+
+-test_l2test_LDADD = lib/libbluetooth.la
++test_l2test_LDADD = @BLUEZ_LIBS@
+
+-test_rctest_LDADD = lib/libbluetooth.la
++test_rctest_LDADD = @BLUEZ_LIBS@
+
+ test_gaptest_LDADD = @DBUS_LIBS@
+
+-test_sdptest_LDADD = lib/libbluetooth.la
++test_sdptest_LDADD = @BLUEZ_LIBS@
+
+-test_scotest_LDADD = lib/libbluetooth.la
++test_scotest_LDADD = @BLUEZ_LIBS@
+
+-test_attest_LDADD = lib/libbluetooth.la
++test_attest_LDADD = @BLUEZ_LIBS@
+
+-test_hstest_LDADD = lib/libbluetooth.la
++test_hstest_LDADD = @BLUEZ_LIBS@
+
+-test_avtest_LDADD = lib/libbluetooth.la
++test_avtest_LDADD = @BLUEZ_LIBS@
+
+-test_lmptest_LDADD = lib/libbluetooth.la
++test_lmptest_LDADD = @BLUEZ_LIBS@
+
+ test_ipctest_SOURCES = test/ipctest.c audio/ipc.h audio/ipc.c
+ test_ipctest_LDADD= @GLIB_LIBS@ sbc/libsbc.la
+
+ test_bdaddr_SOURCES = test/bdaddr.c src/oui.h src/oui.c
+-test_bdaddr_LDADD = lib/libbluetooth.la
++test_bdaddr_LDADD = @BLUEZ_LIBS@
+
+ test_agent_LDADD = @DBUS_LIBS@
+
+ test_btiotest_SOURCES = test/btiotest.c src/btio.h src/btio.c
+-test_btiotest_LDADD = @GLIB_LIBS@ lib/libbluetooth.la
++test_btiotest_LDADD = @GLIB_LIBS@ @BLUEZ_LIBS@
+
+ test_test_textfile_SOURCES = test/test-textfile.c src/textfile.h src/textfile.c
+
+@@ -187,7 +187,7 @@ bin_PROGRAMS += compat/hidd
+ compat_hidd_SOURCES = compat/hidd.c compat/hidd.h src/uinput.h \
+ compat/sdp.h compat/sdp.c compat/fakehid.c \
+ src/textfile.h src/textfile.c
+-compat_hidd_LDADD = -lm lib/libbluetooth.la
++compat_hidd_LDADD = -lm @BLUEZ_LIBS@
+
+ dist_man_MANS += compat/hidd.1
+ else
+@@ -200,7 +200,7 @@ bin_PROGRAMS += compat/pand
+ compat_pand_SOURCES = compat/pand.c compat/pand.h \
+ compat/bnep.c compat/sdp.h compat/sdp.c \
+ src/textfile.h src/textfile.c
+-compat_pand_LDADD = lib/libbluetooth.la
++compat_pand_LDADD = @BLUEZ_LIBS@
+
+ dist_man_MANS += compat/pand.1
+ else
+@@ -213,7 +213,7 @@ bin_PROGRAMS += compat/dund
+ compat_dund_SOURCES = compat/dund.c compat/dund.h compat/lib.h \
+ compat/sdp.h compat/sdp.c compat/dun.c compat/msdun.c \
+ src/textfile.h src/textfile.c
+-compat_dund_LDADD = lib/libbluetooth.la
++compat_dund_LDADD = @BLUEZ_LIBS@
+
+ dist_man_MANS += compat/dund.1
+ else
+diff --git a/acinclude.m4 b/acinclude.m4
+index e7d1c32..bd46d47 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -351,3 +351,14 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+ AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
+ AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")
+ ])
++
++AC_DEFUN([AC_PATH_BLUEZ], [
++ PKG_CHECK_MODULES(BLUEZ, bluez = $PACKAGE_VERSION, [found_bluez=yes], [found_bluez=no])
++ if test "${found_bluez}" = "no"; then
++ BLUEZ_CFLAGS="-I\$(builddir)/lib"
++ BLUEZ_LIBS="-Llib -lbluetooth"
++ fi
++ AC_SUBST(BLUEZ_CFLAGS)
++ AC_SUBST(BLUEZ_LIBS)
++ AM_CONDITIONAL(EXTERNAL_BTLIB, test "${found_bluez}" = "yes")
++])
+diff --git a/configure.ac b/configure.ac
+index 8284104..85d78e9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,6 +35,7 @@ AC_FUNC_PPOLL
+ AC_CHECK_LIB(dl, dlopen, dummy=yes,
+ AC_MSG_ERROR(dynamic linking loader is required))
+
++AC_PATH_BLUEZ
+ AC_PATH_DBUS
+ AC_PATH_GLIB
+ AC_PATH_ALSA
+--
+1.6.4.339.g527d
+
diff --git a/recipes/bluez/bluez4-libs.inc b/recipes/bluez/bluez4-libs.inc
index 4da389cdbb..de475edfde 100644
--- a/recipes/bluez/bluez4-libs.inc
+++ b/recipes/bluez/bluez4-libs.inc
@@ -5,13 +5,14 @@ HOMEPAGE = "http://www.bluez.org"
LICENSE = "GPL"
INC_PR = "r1"
-SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
- file://avinfo-link.patch;patch=1;pnum=0"
+FILESPATHPKG .= ":bluez4-${PV}:bluez4"
+
+SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz"
S = "${WORKDIR}/bluez-${PV}"
+#inherit autotools_stage pkgconfig
inherit autotools_stage
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
EXTRA_OECONF = "\
--disable-tools \
@@ -23,3 +24,8 @@ EXTRA_OECONF = "\
"
FILES_${PN} = "${libdir}/libbluetooth.so.*"
+FILES_${PN}-dev += "\
+ ${libdir}/bluetooth/plugins/*.la \
+ ${libdir}/alsa-lib/*.la \
+ ${libdir}/gstreamer-0.10/*.la \
+"
diff --git a/recipes/bluez/bluez4_4.35.bb b/recipes/bluez/bluez4-utils.inc
index 55cc6463cd..f6cb2e0905 100644
--- a/recipes/bluez/bluez4_4.35.bb
+++ b/recipes/bluez/bluez4-utils.inc
@@ -1,31 +1,28 @@
DESCRIPTION = "Linux Bluetooth Stack Userland V4"
-SECTION = "libs"
+SECTION = "net"
PRIORITY = "optional"
-DEPENDS = "gst-plugins-base alsa-lib virtual/libusb0 dbus-glib"
+# NOTE: sndfile is only a dependency if you want the sbctester app.
+DEPENDS = "bison-native alsa-lib libusb-compat dbus-glib bluez-libs"
HOMEPAGE = "http://www.bluez.org"
LICENSE = "GPL"
+INC_PR = "r2"
-# For angstrom we want this to replace at least bluez-libs
-PROVIDES_append_angstrom = " bluez-utils bluez-libs"
+FILESPATHPKG .= ":bluez4-${PV}:bluez4"
-# temporary solution for KaeilOS just to replace at least bluez-libs
-PROVIDES_append_angstrom = " bluez-utils bluez-libs"
-
-PR = "r2"
-
-SRC_URI = "\
- http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
- file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
+SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
+ file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
file://sbc-thumb.patch;patch=1 \
file://bluetooth.conf \
+ file://separate-libs.patch;patch=1 \
"
+
S = "${WORKDIR}/bluez-${PV}"
inherit autotools_stage
AUTOTOOLS_STAGE_PKGCONFIG = "1"
-EXTRA_OECONF = "\
- --enable-gstreamer \
+EXTRA_AUTORECONF = "-I ${S}"
+EXTRA_OECONF = " \
--enable-alsa \
--enable-usb \
--enable-netlink \
@@ -34,7 +31,7 @@ EXTRA_OECONF = "\
--enable-hid2hci \
--enable-dfutool \
--enable-hidd \
- --enable-pand \
+ --enable-pandd \
--enable-dund \
--disable-cups \
--enable-test \
@@ -42,14 +39,22 @@ EXTRA_OECONF = "\
--enable-configfiles \
--enable-initscripts \
--disable-pcmciarules \
+ --disable-gstreamer \
+ --with-bluez=${STAGING_LIBDIR} \
"
+do_configure_prepend() {
+ sed 's/ include / /;s/ lib / /' <Makefile.am >Makefile.am.new
+ mv Makefile.am.new Makefile.am
+}
+
do_install_append() {
install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
# at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
+ ${B}/${HOST_SYS}-libtool --mode=install install -D -m 0755 test/agent ${D}${bindir}/bluetooth-agent
}
PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
@@ -57,13 +62,4 @@ PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
-FILES_${PN}-dev += "\
- ${libdir}/bluetooth/plugins/*.la \
- ${libdir}/alsa-lib/*.la \
- ${libdir}/gstreamer-0.10/*.la \
-"
-
-FILES_${PN}-dbg += "\
- ${libdir}/bluetooth/plugins/.debug \
- ${libdir}/*/.debug \
-"
+FILES_${PN}-dev = ""
diff --git a/recipes/bluez/bluez4.inc b/recipes/bluez/bluez4.inc
deleted file mode 100644
index ab5dea1bde..0000000000
--- a/recipes/bluez/bluez4.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland V4"
-HOMEPAGE = "http://www.bluez.org"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gst-plugins-base alsa-lib virtual/libusb0 dbus-glib"
-INC_PR = "r5"
-
-# temporary solution until bug 5176 is properly fixed
-PROVIDES += "bluez-utils bluez-libs bluez-utils-dbus"
-RPROVIDES_bluez4 += "bluez-utils bluez-libs bluez-utils-dbus"
-RPROVIDES_bluez4-dev = "bluez-libs-dev"
-
-SRC_URI = "\
- http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
- file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
- file://sbc-thumb.patch;patch=1 \
- file://bluetooth.conf \
-"
-S = "${WORKDIR}/bluez-${PV}"
-
-inherit autotools_stage update-rc.d
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-
-EXTRA_OECONF = "\
- --enable-gstreamer \
- --enable-alsa \
- --enable-usb \
- --enable-netlink \
- --enable-tools \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-dfutool \
- --enable-hidd \
- --enable-pand \
- --enable-dund \
- --disable-cups \
- --enable-test \
- --enable-manpages \
- --enable-configfiles \
- --enable-initscripts \
- --disable-pcmciarules \
-"
-
-do_install_append() {
- install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
- install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
- install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
- # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
- install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
-}
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
-
-PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
-
-FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
-FILES_${PN}-dev += "\
- ${libdir}/bluetooth/plugins/*.la \
- ${libdir}/alsa-lib/*.la \
- ${libdir}/gstreamer-0.10/*.la \
-"
-
-FILES_${PN}-dbg += "\
- ${libdir}/bluetooth/plugins/.debug \
- ${libdir}/*/.debug \
-"
diff --git a/recipes/bluez/bluez-libs/avinfo-link.patch b/recipes/bluez/bluez4/avinfo-link.patch
index 9951b34bde..944a98abca 100644
--- a/recipes/bluez/bluez-libs/avinfo-link.patch
+++ b/recipes/bluez/bluez4/avinfo-link.patch
@@ -1,8 +1,3 @@
-upstream: not applicable
-comment from pb: not needed upstream, it's just a consequence of splitting the
- package into -libs and -apps. But, equally, it wouldn't do any harm upstream
- either. I might send it to them and see what they say.
-
--- tools/Makefile.am.old 2009-05-22 11:27:06.000000000 +0100
+++ tools/Makefile.am 2009-05-22 11:27:29.000000000 +0100
@@ -1,8 +1,10 @@
diff --git a/recipes/bluez/bluez4/hid2hci_usb_init.patch b/recipes/bluez/bluez4/hid2hci_usb_init.patch
deleted file mode 100644
index ed15fd5a1b..0000000000
--- a/recipes/bluez/bluez4/hid2hci_usb_init.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# Signed-off-by: Khem Raj <raj.khem@gmail.com>
-#
-# Use the new usb1 API for usb_init() and check for fails from
-# usb_init (). Currently we see a crash on a system which does
-# not have USB because usb_init() fails and it cleans up all initialized
-# data (e.g. ctx) which is used in subsequent calls to libusb
-# We return immediately if usb_init() fails for some reason.
-
-Index: bluez-4.24/tools/hid2hci.c
-===================================================================
---- bluez-4.24.orig/tools/hid2hci.c 2008-10-25 23:40:34.000000000 -0700
-+++ bluez-4.24/tools/hid2hci.c 2008-12-29 22:06:04.000000000 -0800
-@@ -337,7 +337,7 @@
- int main(int argc, char *argv[])
- {
- struct device_info dev[16];
-- int i, opt, num, quiet = 0, mode = HCI;
-+ int i, ret, opt, num, quiet = 0, mode = HCI;
-
- while ((opt = getopt_long(argc, argv, "+01qh", main_options, NULL)) != -1) {
- switch (opt) {
-@@ -361,8 +361,9 @@
- argc -= optind;
- argv += optind;
- optind = 0;
--
-- usb_init();
-+ ret = libusb_init();
-+ if (ret < 0)
-+ return ret;
-
- num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
- if (num <= 0) {
diff --git a/recipes/bluez/bluez4/sbc-thumb.patch b/recipes/bluez/bluez4/sbc-thumb.patch
deleted file mode 100644
index 3505426053..0000000000
--- a/recipes/bluez/bluez4/sbc-thumb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bluez/sbc/sbc_math.h~ 2008-03-05 20:18:03.000000000 +0000
-+++ bluez/sbc/sbc_math.h 2008-10-27 13:39:27.000000000 +0000
-@@ -59,7 +59,7 @@
-
- #define SBC_FIXED_0(val) { val = 0; }
- #define MUL(a, b) ((a) * (b))
--#ifdef __arm__
-+#if defined(__arm__) && !defined(__thumb__)
- #define MULA(a, b, res) ({ \
- int tmp = res; \
- __asm__( \
diff --git a/recipes/bluez/bluez4/separate-libs.patch b/recipes/bluez/bluez4/separate-libs.patch
new file mode 100644
index 0000000000..af5f41af58
--- /dev/null
+++ b/recipes/bluez/bluez4/separate-libs.patch
@@ -0,0 +1,22 @@
+--- a/acinclude.m4 2009-05-22 16:38:04.000000000 +0100
++++ b/acinclude.m4 2009-05-22 16:38:24.000000000 +0100
+@@ -324,9 +324,6 @@
+ AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
+ fi
+
+- AC_SUBST([BLUEZ_CFLAGS], ['-I$(top_builddir)/include'])
+- AC_SUBST([BLUEZ_LIBS], ['$(top_builddir)/lib/libbluetooth.la'])
+-
+ AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus'])
+ AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la'])
+
+--- a/configure.ac 2009-05-22 16:38:30.000000000 +0100
++++ b/configure.ac 2009-05-22 16:38:35.000000000 +0100
+@@ -7,6 +7,7 @@
+ AM_MAINTAINER_MODE
+
+ AC_INIT_BLUEZ
++AM_PATH_BLUEZ
+
+ COMPILER_FLAGS
+
diff --git a/recipes/bluez/bluez4_4.31.bb b/recipes/bluez/bluez4_4.31.bb
deleted file mode 100644
index ede28578de..0000000000
--- a/recipes/bluez/bluez4_4.31.bb
+++ /dev/null
@@ -1,64 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland V4"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "gst-plugins-base alsa-lib virtual/libusb0 dbus-glib"
-HOMEPAGE = "http://www.bluez.org"
-LICENSE = "GPL"
-PR = "r7"
-
-SRC_URI = "\
- http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
- file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
- file://sbc-thumb.patch;patch=1 \
- file://bluetooth.conf \
-# file://hid2hci_usb_init.patch;patch=1 \
-"
-S = "${WORKDIR}/bluez-${PV}"
-
-inherit autotools pkgconfig
-
-OE_LT_RPATH_ALLOW = "any"
-OE_LT_RPATH_ALLOW[export] = "1"
-
-EXTRA_OECONF = "\
- --enable-gstreamer \
- --enable-alsa \
- --enable-usb \
- --enable-netlink \
- --enable-tools \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-dfutool \
- --enable-hidd \
- --enable-pand \
- --enable-dund \
- --disable-cups \
- --enable-test \
- --enable-manpages \
- --enable-configfiles \
- --enable-initscripts \
- --disable-pcmciarules \
-"
-
-do_install_append() {
- install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
- install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
- install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
- # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
- install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
-}
-
-PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
-
-FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
-FILES_${PN}-dev += "\
- ${libdir}/bluetooth/plugins/*.la \
- ${libdir}/alsa-lib/*.la \
- ${libdir}/gstreamer-0.10/*.la \
-"
-FILES_${PN}-dbg += "\
- ${libdir}/bluetooth/plugins/.debug \
- ${libdir}/*/.debug \
-"
diff --git a/recipes/bluez/bluez4_4.37.bb b/recipes/bluez/bluez4_4.37.bb
deleted file mode 100644
index fced8907ca..0000000000
--- a/recipes/bluez/bluez4_4.37.bb
+++ /dev/null
@@ -1,69 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland V4"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "gst-plugins-base alsa-lib virtual/libusb0 dbus-glib"
-HOMEPAGE = "http://www.bluez.org"
-LICENSE = "GPL"
-
-# For angstrom we want this to replace at least bluez-libs
-PROVIDES_append_angstrom = " bluez-utils bluez-libs"
-
-# temporary solution for KaeilOS just to replace at least bluez-libs
-PROVIDES_append_angstrom = " bluez-utils bluez-libs"
-
-PR = "r1"
-
-SRC_URI = "\
- http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
- file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
- file://sbc-thumb.patch;patch=1 \
- file://bluetooth.conf \
-"
-S = "${WORKDIR}/bluez-${PV}"
-
-inherit autotools_stage
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-
-EXTRA_OECONF = "\
- --enable-gstreamer \
- --enable-alsa \
- --enable-usb \
- --enable-netlink \
- --enable-tools \
- --enable-bccmd \
- --enable-hid2hci \
- --enable-dfutool \
- --enable-hidd \
- --enable-pand \
- --enable-dund \
- --disable-cups \
- --enable-test \
- --enable-manpages \
- --enable-configfiles \
- --enable-initscripts \
- --disable-pcmciarules \
-"
-
-do_install_append() {
- install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
- install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
- install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
- # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
- install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
-}
-
-PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
-
-FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
-FILES_${PN}-dev += "\
- ${libdir}/bluetooth/plugins/*.la \
- ${libdir}/alsa-lib/*.la \
- ${libdir}/gstreamer-0.10/*.la \
-"
-
-FILES_${PN}-dbg += "\
- ${libdir}/bluetooth/plugins/.debug \
- ${libdir}/*/.debug \
-"
diff --git a/recipes/bluez/bluez4_4.39.bb b/recipes/bluez/bluez4_4.39.bb
deleted file mode 100644
index 7a2968bda7..0000000000
--- a/recipes/bluez/bluez4_4.39.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require bluez4.inc
-
-PR = "${INC_PR}.1"
-
diff --git a/recipes/bluez/bluez4_4.41.bb b/recipes/bluez/bluez4_4.41.bb
deleted file mode 100644
index 7a2968bda7..0000000000
--- a/recipes/bluez/bluez4_4.41.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require bluez4.inc
-
-PR = "${INC_PR}.1"
-
diff --git a/recipes/bluez/bluez4_4.42.bb b/recipes/bluez/bluez4_4.42.bb
deleted file mode 100644
index 2d882759f9..0000000000
--- a/recipes/bluez/bluez4_4.42.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require bluez4.inc
-
-DEPENDS += "libsndfile1"
-PR = "${INC_PR}.1"
-
diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb
index d59acba026..79f63769fb 100644
--- a/recipes/tasks/task-base.bb
+++ b/recipes/tasks/task-base.bb
@@ -69,7 +69,6 @@ DISTRO_APM ?= "apm"
DISTRO_BLUETOOTH_MANAGER ?= "\
blueprobe \
bluez-utils \
- bluez-utils-compat \
"
#
@@ -244,8 +243,6 @@ task-base-pcmcia26 = "\
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
-# 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 = "\
${DISTRO_BLUETOOTH_MANAGER} \
"