summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-06-01 14:17:44 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-06-01 14:17:44 +0100
commit4ae5537fffdc9c8dc11b26511c2c8a3196916071 (patch)
treefb602326e5fa42b25def6c5aed659420ee4effba /meta
parent3051258e33c6a39aa8f8f2e3fef21945b12fbe9e (diff)
downloadpoky-4ae5537fffdc9c8dc11b26511c2c8a3196916071.tar.gz
bluez: Update bluez4 version from OE.dev and drop bluez 3.x
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/bluez/bluez-dtl1-workaround/02dtl1_cs.sh (renamed from meta/packages/bluez/files/02dtl1_cs.sh)0
-rw-r--r--meta/packages/bluez/bluez-libs.inc21
-rw-r--r--meta/packages/bluez/bluez-libs_3.36.bb1
-rw-r--r--meta/packages/bluez/bluez-utils/hcid.conf57
-rw-r--r--meta/packages/bluez/bluez-utils3.inc141
-rw-r--r--meta/packages/bluez/bluez-utils_3.36.bb64
-rw-r--r--meta/packages/bluez/bluez4.inc41
-rw-r--r--meta/packages/bluez/bluez4/bluetooth.conf16
-rw-r--r--meta/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch13
-rw-r--r--meta/packages/bluez/bluez4/hid2hci_usb_init.patch33
-rw-r--r--meta/packages/bluez/bluez4/sbc-thumb.patch11
-rw-r--r--meta/packages/bluez/bluez4_4.17.bb50
-rw-r--r--meta/packages/bluez/bluez4_4.39.bb66
-rw-r--r--meta/packages/bluez/bluez4_4.7.bb11
-rw-r--r--meta/packages/bluez/files/default-manfid-0x0-to-bcps.patch22
15 files changed, 139 insertions, 408 deletions
diff --git a/meta/packages/bluez/files/02dtl1_cs.sh b/meta/packages/bluez/bluez-dtl1-workaround/02dtl1_cs.sh
index fefc72e07a..fefc72e07a 100644
--- a/meta/packages/bluez/files/02dtl1_cs.sh
+++ b/meta/packages/bluez/bluez-dtl1-workaround/02dtl1_cs.sh
diff --git a/meta/packages/bluez/bluez-libs.inc b/meta/packages/bluez/bluez-libs.inc
deleted file mode 100644
index 2f33120718..0000000000
--- a/meta/packages/bluez/bluez-libs.inc
+++ /dev/null
@@ -1,21 +0,0 @@
1DESCRIPTION = "Linux Bluetooth Stack Userland Libaries."
2SECTION = "libs"
3PRIORITY = "optional"
4HOMEPAGE = "http://www.bluez.org"
5LICENSE = "GPL"
6
7SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
8
9inherit autotools pkgconfig
10
11HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
12
13do_stage() {
14 oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
15
16 install -d ${STAGING_INCDIR}/bluetooth/
17 for f in ${HEADERS}
18 do
19 install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
20 done
21}
diff --git a/meta/packages/bluez/bluez-libs_3.36.bb b/meta/packages/bluez/bluez-libs_3.36.bb
deleted file mode 100644
index 6ddf62a4fb..0000000000
--- a/meta/packages/bluez/bluez-libs_3.36.bb
+++ /dev/null
@@ -1 +0,0 @@
1require bluez-libs.inc
diff --git a/meta/packages/bluez/bluez-utils/hcid.conf b/meta/packages/bluez/bluez-utils/hcid.conf
deleted file mode 100644
index a7164f6eb0..0000000000
--- a/meta/packages/bluez/bluez-utils/hcid.conf
+++ /dev/null
@@ -1,57 +0,0 @@
1#
2# HCI daemon configuration file.
3#
4
5# HCId options
6options {
7 # Automatically initialize new devices
8 autoinit yes;
9
10 # Security Manager mode
11 # none - Security manager disabled
12 # auto - Use local PIN for incoming connections
13 # user - Always ask user for a PIN
14 #
15 security auto;
16
17 # Pairing mode
18 # none - Pairing disabled
19 # multi - Allow pairing with already paired devices
20 # once - Pair once and deny successive attempts
21 pairing multi;
22
23 # Default PIN code for incoming connections
24 passkey "1234";
25}
26
27# Default settings for HCI devices
28device {
29 # Local device name
30 # %d - device id
31 # %h - host name
32 name "%h (%d)";
33
34 # Local device class
35 class 0x120112;
36
37 # Default packet type
38 #pkt_type DH1,DM1,HV1;
39
40 # Inquiry and Page scan
41 iscan enable; pscan enable;
42
43 # Default link mode
44 # none - no specific policy
45 # accept - always accept incoming connections
46 # master - become master on incoming connections,
47 # deny role switch on outgoing connections
48 lm accept;
49
50 # Default link policy
51 # none - no specific policy
52 # rswitch - allow role switch
53 # hold - allow hold mode
54 # sniff - allow sniff mode
55 # park - allow park mode
56 lp rswitch,hold,sniff,park;
57}
diff --git a/meta/packages/bluez/bluez-utils3.inc b/meta/packages/bluez/bluez-utils3.inc
deleted file mode 100644
index e5dae635b8..0000000000
--- a/meta/packages/bluez/bluez-utils3.inc
+++ /dev/null
@@ -1,141 +0,0 @@
1DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
2SECTION = "console"
3PRIORITY = "optional"
4DEPENDS = "gstreamer gst-plugins-base bluez-libs-${PV} libusb-compat dbus glib-2.0"
5PROVIDES = "bluez-utils-dbus"
6RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
7RREPLACES = "bluez-utils-dbus"
8RCONFLICTS_${PN} = "bluez-utils-nodbus"
9LICENSE = "GPL"
10
11FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils"
12
13S = "${WORKDIR}/bluez-utils-${PV}"
14
15inherit autotools update-rc.d
16
17EXTRA_OECONF = " \
18 --enable-bccmd \
19 --enable-hid2hci \
20 --enable-alsa \
21 --enable-cups \
22 --enable-glib \
23 --disable-sdpd \
24 --enable-network \
25 --enable-serial \
26 --enable-input \
27 --enable-audio \
28 --enable-echo \
29 --enable-configfile \
30 --enable-initscripts \
31 --enable-test \
32 "
33
34# The config options are explained below:
35
36# --enable-obex enable OBEX support
37# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
38# --enable-cups install CUPS backend support
39# --enable-bccmd install BCCMD interface utility
40# --enable-avctrl install Audio/Video control utility
41# --enable-hid2hci install HID mode switching utility
42# --enable-dfutool install DFU firmware upgrade utility
43
44# --enable-glib For systems that use and install GLib anyway
45# --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
46
47#Following services can be enabled so far:
48# --enable-network
49# --enable-serial
50# --enable-input
51# --enable-audio
52# --enable-echo
53
54#There is no need to modify any init script. They will be started
55#automatically or on demand. Only /etc/bluetooth/*.service files should
56#be patched to change name or the autostart value.
57# --enable-configfile
58# --enable-initscripts
59
60#For even smaller -doc packages
61# --disable-manpages
62# --disable-pcmciarules
63
64#I haven't seen any embedded device with HID proxy support. So simply
65#disable it:
66# --disable-hid2hci
67
68OE_LT_RPATH_ALLOW = "any"
69OE_LT_RPATH_ALLOW[export]="1"
70
71do_install_append() {
72 install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/
73 if [ "${sbindir}" != "${base_sbindir}" ]; then
74 mv ${D}${sbindir}/* ${D}${base_sbindir}/
75 rmdir ${D}${sbindir}
76 fi
77 if [ "${bindir}" != "${base_bindir}" ]; then
78 mv ${D}${bindir}/* ${D}${base_bindir}/
79 rmdir ${D}${bindir}
80 fi
81 chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
82 install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
83 install -m 0644 ${S}/rfcomm/rfcomm.conf ${D}${sysconfdir}/bluetooth/
84 install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/ ||true
85 install -m 0755 ${S}/test/.libs/passkey-agent ${D}${base_bindir}/ ||true
86}
87
88
89INITSCRIPT_NAME = "bluetooth"
90INITSCRIPT_PARAMS = "defaults 23 19"
91
92
93PACKAGES =+ "${PN}-compat"
94
95
96FILES_${PN} = " \
97 ${base_sbindir}/hcid \
98 ${libdir}/bluetooth \
99 ${sysconfdir}/init.d/bluetooth \
100 ${sysconfdir}/bluetooth/*.service \
101 ${sysconfdir}/bluetooth/hcid.conf \
102 ${sysconfdir}/default \
103 ${sysconfdir}/dbus-1 \
104 ${base_sbindir}/hciattach \
105 "
106
107FILES_${PN}-dbg += " \
108 ${libdir}/bluetooth/.debug \
109 ${libdir}/cups/backend/.debug \
110 ${libdir}/alsa-lib/.debug \
111 "
112
113FILES_${PN}-compat = " \
114 ${base_bindir}/sdptool \
115 ${base_bindir}/dund \
116 ${base_bindir}/rctest \
117 ${base_bindir}/ciptool \
118 ${base_bindir}/l2test \
119 ${base_bindir}/rfcomm \
120 ${base_bindir}/hcitool \
121 ${base_bindir}/pand \
122 ${base_bindir}/hidd \
123 ${base_bindir}/l2ping \
124 ${base_sbindir}/hciconfig \
125 ${base_sbindir}/bccmd \
126 ${base_sbindir}/hciemu \
127 ${base_sbindir}/hid2hci \
128 ${base_bindir}/passkey-agent \
129 ${sysconfdir}/bluetooth/rfcomm.conf \
130 "
131
132
133
134
135
136
137
138
139
140
141
diff --git a/meta/packages/bluez/bluez-utils_3.36.bb b/meta/packages/bluez/bluez-utils_3.36.bb
deleted file mode 100644
index cf6d6328ea..0000000000
--- a/meta/packages/bluez/bluez-utils_3.36.bb
+++ /dev/null
@@ -1,64 +0,0 @@
1require bluez-utils3.inc
2
3PR = "r1"
4
5SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
6 file://hcid.conf \
7 "
8
9# see bluez-utils3.inc for the explanation of these option
10EXTRA_OECONF = " \
11 --enable-bccmd \
12 --enable-hid2hci \
13 --enable-hidd \
14 --enable-pand \
15 --enable-dund \
16 --disable-alsa \
17 --disable-cups \
18 --enable-glib \
19 --disable-sdpd \
20 --enable-network \
21 --enable-serial \
22 --enable-input \
23 --enable-audio \
24 --enable-echo \
25 --enable-configfile \
26 --enable-initscripts \
27 --enable-test \
28 "
29
30CONFFILES_${PN} = " \
31 ${sysconfdir}/bluetooth/hcid.conf \
32 ${sysconfdir}/default/bluetooth \
33 "
34
35CONFFILES_${PN}-compat = " \
36 ${sysconfdir}/bluetooth/rfcomm.conf \
37 "
38
39PACKAGES =+ "bluez-audio"
40
41FILES_${PN} = " \
42 ${base_sbindir}/hcid \
43 ${libdir}/bluetooth/plugins/*.so \
44 ${sysconfdir}/init.d/bluetooth \
45 ${sysconfdir}/bluetooth/hcid.conf \
46 ${sysconfdir}/default \
47 ${sysconfdir}/dbus-1 \
48 ${base_sbindir}/hciattach \
49 "
50
51FILES_bluez-audio = " \
52 ${libdir}/bluetooth/plugins/libaudio.so \
53 ${libdir}/gstreamer-0.10/*.so \
54 "
55
56FILES_${PN}-dbg += " \
57 ${libdir}/bluetooth/plugins/.debug \
58 ${libdir}/gstreamer-0.10/.debug \
59 "
60
61FILES_${PN}-dev += " \
62 ${libdir}/bluetooth/plugins/*.la \
63 ${libdir}/gstreamer-0.10/*.la \
64 "
diff --git a/meta/packages/bluez/bluez4.inc b/meta/packages/bluez/bluez4.inc
deleted file mode 100644
index 4afb0fd8fa..0000000000
--- a/meta/packages/bluez/bluez4.inc
+++ /dev/null
@@ -1,41 +0,0 @@
1DESCRIPTION = "BlueZ - Bluetooth protocol stack for Linux"
2SECTION = "console"
3PRIORITY = "optional"
4DEPENDS = "gstreamer gst-plugins-base libusb dbus"
5PROVIDES = "bluez-utils-dbus"
6RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
7RREPLACES_${PN} = "bluez-utils-dbus"
8RCONFLICTS_${PN} = "bluez-utils-nodbus"
9LICENSE = "GPL"
10
11SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz"
12
13S = "${WORKDIR}/bluez-${PV}"
14
15inherit autotools update-rc.d pkgconfig
16
17INITSCRIPT_NAME = "bluetooth"
18INITSCRIPT_PARAMS = "defaults 23 19"
19
20do_install_append() {
21 install -d ${D}${base_sbindir} ${D}${base_bindir}/
22 echo base_sbindir is: ${D}${base_sbindir}
23 mv ${D}${sbindir}/* ${D}${base_sbindir}/
24 mv ${D}${bindir}/* ${D}${base_bindir}/
25 rmdir ${D}${bindir} ${D}${sbindir}
26 chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
27}
28
29PACKAGES =+ "${PN}-alsa ${PN}-alsa-dev gst-plugin-bluez gst-plugin-bluez-dev ${PN}-lib ${PN}-lib-dev ${PN}-lib-dbg"
30
31FILES_${PN}-alsa = " ${libdir}/alsa-lib/*.so "
32FILES_${PN}-alsa-dev += " ${libdir}/alsa-lib/*.la "
33
34FILES_gst-plugin-bluez = "${libdir}/gstreamer-*/*.so"
35FILES_gst-plugin-bluez-dev = "${libdir}/gstreamer-*/*.la"
36FILES_${PN}-lib = "${libdir}/libbluetooth.so.*"
37FILES_${PN}-lib-dev = "${libdir}/libbluetooth.so \
38 ${libdir}/*.la \
39 ${includedir}/bluetooth \
40 ${libdir}/pkgconfig/bluez.pc \
41 "
diff --git a/meta/packages/bluez/bluez4/bluetooth.conf b/meta/packages/bluez/bluez4/bluetooth.conf
new file mode 100644
index 0000000000..ca5e9e4f2f
--- /dev/null
+++ b/meta/packages/bluez/bluez4/bluetooth.conf
@@ -0,0 +1,16 @@
1<!-- This configuration file specifies the required security policies
2 for Bluetooth core daemon to work. -->
3
4<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
5 "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
6<busconfig>
7
8 <!-- ../system.conf have denied everything, so we just punch some holes -->
9
10 <policy context="default">
11 <allow own="org.bluez"/>
12 <allow send_destination="org.bluez"/>
13 <allow send_interface="org.bluez.Agent"/>
14 </policy>
15
16</busconfig>
diff --git a/meta/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch b/meta/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch
new file mode 100644
index 0000000000..b1ee510e8b
--- /dev/null
+++ b/meta/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch
@@ -0,0 +1,13 @@
1Index: bluez-4.27/tools/dfutool.c
2===================================================================
3--- bluez-4.27.orig/tools/dfutool.c
4+++ bluez-4.27/tools/dfutool.c
5@@ -59,7 +59,7 @@
6 #endif
7
8 #ifdef NEED_USB_GET_BUSSES
9-static inline struct usb_bus *usb_get_busses(void)
10+inline struct usb_bus *usb_get_busses(void)
11 {
12 return usb_busses;
13 }
diff --git a/meta/packages/bluez/bluez4/hid2hci_usb_init.patch b/meta/packages/bluez/bluez4/hid2hci_usb_init.patch
new file mode 100644
index 0000000000..ed15fd5a1b
--- /dev/null
+++ b/meta/packages/bluez/bluez4/hid2hci_usb_init.patch
@@ -0,0 +1,33 @@
1# Signed-off-by: Khem Raj <raj.khem@gmail.com>
2#
3# Use the new usb1 API for usb_init() and check for fails from
4# usb_init (). Currently we see a crash on a system which does
5# not have USB because usb_init() fails and it cleans up all initialized
6# data (e.g. ctx) which is used in subsequent calls to libusb
7# We return immediately if usb_init() fails for some reason.
8
9Index: bluez-4.24/tools/hid2hci.c
10===================================================================
11--- bluez-4.24.orig/tools/hid2hci.c 2008-10-25 23:40:34.000000000 -0700
12+++ bluez-4.24/tools/hid2hci.c 2008-12-29 22:06:04.000000000 -0800
13@@ -337,7 +337,7 @@
14 int main(int argc, char *argv[])
15 {
16 struct device_info dev[16];
17- int i, opt, num, quiet = 0, mode = HCI;
18+ int i, ret, opt, num, quiet = 0, mode = HCI;
19
20 while ((opt = getopt_long(argc, argv, "+01qh", main_options, NULL)) != -1) {
21 switch (opt) {
22@@ -361,8 +361,9 @@
23 argc -= optind;
24 argv += optind;
25 optind = 0;
26-
27- usb_init();
28+ ret = libusb_init();
29+ if (ret < 0)
30+ return ret;
31
32 num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
33 if (num <= 0) {
diff --git a/meta/packages/bluez/bluez4/sbc-thumb.patch b/meta/packages/bluez/bluez4/sbc-thumb.patch
new file mode 100644
index 0000000000..3505426053
--- /dev/null
+++ b/meta/packages/bluez/bluez4/sbc-thumb.patch
@@ -0,0 +1,11 @@
1--- bluez/sbc/sbc_math.h~ 2008-03-05 20:18:03.000000000 +0000
2+++ bluez/sbc/sbc_math.h 2008-10-27 13:39:27.000000000 +0000
3@@ -59,7 +59,7 @@
4
5 #define SBC_FIXED_0(val) { val = 0; }
6 #define MUL(a, b) ((a) * (b))
7-#ifdef __arm__
8+#if defined(__arm__) && !defined(__thumb__)
9 #define MULA(a, b, res) ({ \
10 int tmp = res; \
11 __asm__( \
diff --git a/meta/packages/bluez/bluez4_4.17.bb b/meta/packages/bluez/bluez4_4.17.bb
deleted file mode 100644
index 437dfe679b..0000000000
--- a/meta/packages/bluez/bluez4_4.17.bb
+++ /dev/null
@@ -1,50 +0,0 @@
1require bluez4.inc
2
3DEPENDS += "glib-2.0"
4PR = "r4"
5
6PACKAGES =+ "${PN}-compat"
7
8CONFFILES_${PN} = " \
9 ${sysconfdir}/bluetooth/main.conf \
10 "
11
12CONFFILES_${PN}-compat = " \
13 ${sysconfdir}/bluetooth/rfcomm.conf \
14 "
15
16FILES_${PN} = " \
17 ${base_sbindir}/bluetoothd \
18 ${libdir}/bluetooth \
19 ${sysconfdir}/init.d/bluetooth \
20 ${sysconfdir}/bluetooth/*.service \
21 ${sysconfdir}/bluetooth/main.conf \
22 ${sysconfdir}/default \
23 ${sysconfdir}/dbus-1 \
24 ${base_sbindir}/hciattach \
25 ${base_sbindir}/hid2hci \
26 "
27
28FILES_${PN}-dbg += " \
29 ${libdir}/bluetooth/.debug \
30 ${libdir}/cups/backend/.debug \
31 ${libdir}/alsa-lib/.debug \
32 "
33
34FILES_${PN}-lib-dbg += " ${libdir}/bluetooth/plugins/.debug/*.so"
35
36
37FILES_${PN}-compat = " \
38 ${base_sbindir}/bccmd \
39 ${base_sbindir}/hciconfig \
40 ${base_bindir}/ciptool \
41 ${base_bindir}/dfutool \
42 ${base_bindir}/dund \
43 ${base_bindir}/hcitool \
44 ${base_bindir}/hidd \
45 ${base_bindir}/l2ping \
46 ${base_bindir}/pand \
47 ${base_bindir}/rfcomm \
48 ${base_bindir}/sdptool \
49 ${sysconfdir}/bluetooth/rfcomm.conf \
50 "
diff --git a/meta/packages/bluez/bluez4_4.39.bb b/meta/packages/bluez/bluez4_4.39.bb
new file mode 100644
index 0000000000..507b3b8446
--- /dev/null
+++ b/meta/packages/bluez/bluez4_4.39.bb
@@ -0,0 +1,66 @@
1DESCRIPTION = "Linux Bluetooth Stack Userland V4"
2SECTION = "libs"
3PRIORITY = "optional"
4DEPENDS = "gst-plugins-base alsa-lib libusb-compat dbus-glib"
5HOMEPAGE = "http://www.bluez.org"
6LICENSE = "GPL"
7
8# For angstrom we want this to replace at least bluez-libs
9PROVIDES_append_angstrom = " bluez-utils bluez-libs"
10
11ASNEEDED = ""
12
13SRC_URI = "\
14 http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
15 file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
16 file://sbc-thumb.patch;patch=1 \
17 file://bluetooth.conf \
18"
19S = "${WORKDIR}/bluez-${PV}"
20
21inherit autotools_stage
22AUTOTOOLS_STAGE_PKGCONFIG = "1"
23
24EXTRA_OECONF = "\
25 --enable-gstreamer \
26 --enable-alsa \
27 --enable-usb \
28 --enable-netlink \
29 --enable-tools \
30 --enable-bccmd \
31 --enable-hid2hci \
32 --enable-dfutool \
33 --enable-hidd \
34 --enable-pandd \
35 --enable-dund \
36 --disable-cups \
37 --enable-test \
38 --enable-manpages \
39 --enable-configfiles \
40 --enable-initscripts \
41 --disable-pcmciarules \
42"
43
44do_install_append() {
45 install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
46 install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
47 install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
48 # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
49 install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
50}
51
52PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
53
54FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
55FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
56FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
57FILES_${PN}-dev += "\
58 ${libdir}/bluetooth/plugins/*.la \
59 ${libdir}/alsa-lib/*.la \
60 ${libdir}/gstreamer-0.10/*.la \
61"
62
63FILES_${PN}-dbg += "\
64 ${libdir}/bluetooth/plugins/.debug \
65 ${libdir}/*/.debug \
66"
diff --git a/meta/packages/bluez/bluez4_4.7.bb b/meta/packages/bluez/bluez4_4.7.bb
deleted file mode 100644
index ae579dd0ae..0000000000
--- a/meta/packages/bluez/bluez4_4.7.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "Linux Bluetooth Stack Userland."
2SECTION = "libs"
3PRIORITY = "optional"
4HOMEPAGE = "http://www.bluez.org"
5LICENSE = "GPL"
6PR = "r0"
7
8SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz"
9S = "${WORKDIR}/bluez-${PV}"
10
11inherit autotools pkgconfig
diff --git a/meta/packages/bluez/files/default-manfid-0x0-to-bcps.patch b/meta/packages/bluez/files/default-manfid-0x0-to-bcps.patch
deleted file mode 100644
index 3d993543b3..0000000000
--- a/meta/packages/bluez/files/default-manfid-0x0-to-bcps.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- bluez-utils-2.16/tools/hciattach.c~default-manfid-0x0-to-bcps
7+++ bluez-utils-2.16/tools/hciattach.c
8@@ -796,13 +796,12 @@
9 }
10
11 struct uart_t uart[] = {
12+ { "bcsp", 0x0000, 0x0000, HCI_UART_BCSP, 115200, 115200, 0, bcsp },
13 { "any", 0x0000, 0x0000, HCI_UART_H4, 115200, 115200, FLOW_CTL, NULL },
14 { "ericsson", 0x0000, 0x0000, HCI_UART_H4, 57600, 115200, FLOW_CTL, ericsson },
15 { "digi", 0x0000, 0x0000, HCI_UART_H4, 9600, 115200, FLOW_CTL, digi },
16 { "texas", 0x0000, 0x0000, HCI_UART_H4, 115200, 115200, FLOW_CTL, texas },
17
18- { "bcsp", 0x0000, 0x0000, HCI_UART_BCSP, 115200, 115200, 0, bcsp },
19-
20 /* Xircom PCMCIA cards: Credit Card Adapter and Real Port Adapter */
21 { "xircom", 0x0105, 0x080a, HCI_UART_H4, 115200, 115200, FLOW_CTL, NULL },
22
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 19:26:32 +0000