3 files changed, 93 insertions, 0 deletions

diff --git a/meta-eca/recipes-connectivity/bluez5/bluez5_git.bb b/meta-eca/recipes-connectivity/bluez5/bluez5_git.bb
new file mode 100644
index 0000000..f327e9c
--- /dev/null
+++ b/meta-eca/recipes-connectivity/bluez5/bluez5_git.bb
@@ -0,0 +1,21 @@
+require recipes-connectivity/bluez5/bluez5.inc
+
+SRCREV = "cdfdc6b2b6182ef09c28d49873f79c581ab04de5"
+SRC_URI = "\
+        git://git.kernel.org/pub/scm/bluetooth/bluez.git \
+        file://bluetooth.conf \
+        file://fix-udev-paths.patch \
+"
+
+S = "${WORKDIR}/git"
+PV = "5.18+git${SRCPV}"
+
+EXTRA_OECONF += "\
+    --disable-obex \
+    --enable-client \
+"
+
+do_install_append() {
+        # gatttool is useful to have so add it to the bluez5 package
+        install -m 0755 ${S}/attrib/gatttool ${D}/${bindir}
+}
diff --git a/meta-eca/recipes-connectivity/bluez5/files/bluetooth.conf b/meta-eca/recipes-connectivity/bluez5/files/bluetooth.conf
new file mode 100644
index 0000000..0495200
--- /dev/null
+++ b/meta-eca/recipes-connectivity/bluez5/files/bluetooth.conf
@@ -0,0 +1,37 @@
+<!-- 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 user="root">
+    <allow own="org.bluez"/>
+    <allow send_destination="org.bluez"/>
+    <allow send_interface="org.bluez.Agent1"/>
+    <allow send_interface="org.bluez.MediaEndpoint1"/>
+    <allow send_interface="org.bluez.MediaPlayer1"/>
+    <allow send_interface="org.bluez.ThermometerWatcher1"/>
+    <allow send_interface="org.bluez.AlertAgent1"/>
+    <allow send_interface="org.bluez.Profile1"/>
+    <allow send_interface="org.bluez.HeartRateWatcher1"/>
+    <allow send_interface="org.bluez.CyclingSpeedWatcher1"/>
+  </policy>
+
+  <policy at_console="true">
+    <allow send_destination="org.bluez"/>
+  </policy>
+
+  <!-- allow users of lp group (printing subsystem) to 
+       communicate with bluetoothd -->
+  <policy group="lp">
+    <allow send_destination="org.bluez"/>
+  </policy>
+
+  <policy context="default">
+    <deny send_destination="org.bluez"/>
+  </policy>
+
+</busconfig>
diff --git a/meta-eca/recipes-connectivity/bluez5/files/fix-udev-paths.patch b/meta-eca/recipes-connectivity/bluez5/files/fix-udev-paths.patch
new file mode 100644
index 0000000..37362f5
--- /dev/null
+++ b/meta-eca/recipes-connectivity/bluez5/files/fix-udev-paths.patch
@@ -0,0 +1,35 @@
+Add udevdir/udevrulesdir options
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
+
+Index: bluez-5.0/Makefile.am
+===================================================================
+--- bluez-5.0.orig/Makefile.am  2012-12-24 19:46:54.000000000 +0200
++++ bluez-5.0/Makefile.am       2013-01-30 14:33:15.760615474 +0200
+@@ -175,7 +175,7 @@
+ include Makefile.obexd
+ 
+ if HID2HCI
+-rulesdir = @UDEV_DIR@/rules.d
++rulesdir = @UDEV_RULES_DIR@
+ 
+ rules_DATA = tools/97-hid2hci.rules
+ 
+Index: bluez-5.0/configure.ac
+===================================================================
+--- bluez-5.0.orig/configure.ac 2012-12-24 19:46:54.000000000 +0200
++++ bluez-5.0/configure.ac      2013-01-30 14:34:59.068613895 +0200
+@@ -160,6 +160,11 @@
+        AC_SUBST(UDEV_DIR, [${path_udevdir}])
+ fi
+ 
++AC_ARG_WITH([udevrulesdir],
++    AS_HELP_STRING([--with-udevrulesdir=DIR], [udev rules directory]),
++    [], [with_udevrulesdir=/lib/udev/rules.d])
++AC_SUBST([UDEV_RULES_DIR], [$with_udevrulesdir])
++
+ AM_CONDITIONAL(HID2HCI, test "${enable_tools}" != "no" &&
+                test "${enable_udev}" != "no" && test "${enable_usb}" != "no")
+