From 13fb21d155892b48b518c870e5ee23f9b81e3ee7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Fri, 12 Aug 2011 09:32:04 +0200
Subject: 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>
---
 .../recipes-connectivity/bluez/bluez4/bluetooth.conf | 16 ++++++++++++++++
 .../fix-dfutool-usb-declaration-mismatch.patch       | 20 ++++++++++++++++++++
 meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb    |  2 --
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4/bluetooth.conf
 create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch

(limited to 'meta-oe/recipes-connectivity/bluez')

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 0000000000..ca5e9e4f2f
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bluez/bluez4/bluetooth.conf
@@ -0,0 +1,16 @@
+<!-- This configuration file specifies the required security policies
+     for Bluetooth core daemon to work. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- ../system.conf have denied everything, so we just punch some holes -->
+
+  <policy context="default">
+    <allow own="org.bluez"/>
+    <allow send_destination="org.bluez"/>
+    <allow send_interface="org.bluez.Agent"/>
+  </policy>
+
+</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 0000000000..27dead092a
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch
@@ -0,0 +1,20 @@
+# bluez4: add compile patch fixing some usb declaration mismatch
+# Author: Michael 'Mickey' Lauer <mickey@vanille-media.de>
+# Date:   Thu Jan 29 16:52:21 2009 +0000
+#
+# Acquired from OpenEmbedded
+Upstream-Status: Pending
+
+Index: bluez-4.27/tools/dfutool.c
+===================================================================
+--- bluez-4.27.orig/tools/dfutool.c
++++ bluez-4.27/tools/dfutool.c
+@@ -59,7 +59,7 @@
+ #endif
+ 
+ #ifdef NEED_USB_GET_BUSSES
+-static inline struct usb_bus *usb_get_busses(void)
++inline struct usb_bus *usb_get_busses(void)
+ {
+ 	return usb_busses;
+ }
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb b/meta-oe/recipes-connectivity/bluez/bluez4_4.96.bb
index d48fcdb2c4..211e910650 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 = ""
 
 PR = "r0"
 
-# to find bluez patches from oe-core
-FILESPATH =. "${COREBASE}/meta/recipes-connectivity/bluez/bluez4-4.82/:"
 SRC_URI = "\
   ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
   file://fix-dfutool-usb-declaration-mismatch.patch \
-- 
cgit 1.2.3-korg