diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-08-12 09:32:04 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-08-12 09:32:04 +0200 |
commit | 13fb21d155892b48b518c870e5ee23f9b81e3ee7 (patch) | |
tree | af91e184200c2cb6ef474bf61c56297e7f4f356c /meta-oe/recipes-connectivity/bluez | |
parent | 187c1c9bb8679bb07636730e01b9c3c4c5ed9cdf (diff) | |
download | meta-openembedded-13fb21d155892b48b518c870e5ee23f9b81e3ee7.tar.gz |
bluez4 4.96: import needed files from OE-core to avoid breakage on OE-core updates
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-connectivity/bluez')
3 files changed, 36 insertions, 2 deletions
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4/bluetooth.conf b/meta-oe/recipes-connectivity/bluez/bluez4/bluetooth.conf new file mode 100644 index 000000000..ca5e9e4f2 --- /dev/null +++ b/meta-oe/recipes-connectivity/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-oe/recipes-connectivity/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch b/meta-oe/recipes-connectivity/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch new file mode 100644 index 000000000..27dead092 --- /dev/null +++ b/meta-oe/recipes-connectivity/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | # bluez4: add compile patch fixing some usb declaration mismatch | ||
2 | # Author: Michael 'Mickey' Lauer <mickey@vanille-media.de> | ||
3 | # Date: Thu Jan 29 16:52:21 2009 +0000 | ||
4 | # | ||
5 | # Acquired from OpenEmbedded | ||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: bluez-4.27/tools/dfutool.c | ||
9 | =================================================================== | ||
10 | --- bluez-4.27.orig/tools/dfutool.c | ||
11 | +++ bluez-4.27/tools/dfutool.c | ||
12 | @@ -59,7 +59,7 @@ | ||
13 | #endif | ||
14 | |||
15 | #ifdef NEED_USB_GET_BUSSES | ||
16 | -static inline struct usb_bus *usb_get_busses(void) | ||
17 | +inline struct usb_bus *usb_get_busses(void) | ||
18 | { | ||
19 | return usb_busses; | ||
20 | } | ||
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb b/meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb index d48fcdb2c..211e91065 100644 --- a/meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb +++ b/meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb | |||
@@ -14,8 +14,6 @@ ASNEEDED = "" | |||
14 | 14 | ||
15 | PR = "r0" | 15 | PR = "r0" |
16 | 16 | ||
17 | # to find bluez patches from oe-core | ||
18 | FILESPATH =. "${COREBASE}/meta/recipes-connectivity/bluez/bluez4-4.82/:" | ||
19 | SRC_URI = "\ | 17 | SRC_URI = "\ |
20 | ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ | 18 | ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ |
21 | file://fix-dfutool-usb-declaration-mismatch.patch \ | 19 | file://fix-dfutool-usb-declaration-mismatch.patch \ |