summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bluez5
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-07-30 14:48:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-03 10:33:04 +0100
commita767e362580b68dfc50fb3c54289f97558abb60c (patch)
tree1522d54483c21307f68a372198c4d004e1a9ffba /meta/recipes-connectivity/bluez5
parent159c1c8e46fcabe9b87fcd3e6e6812198e007bbd (diff)
downloadpoky-a767e362580b68dfc50fb3c54289f97558abb60c.tar.gz
bluez5: Add obex-profiles as a PACKAGECONFIG, package obexd separately
--enable-obex controls if obexd supports extra profiles (currently IRMC and PBAB), which brings in a dependency on libical for the dummy phonebook implementation. Based on work by Saul Wold <sgw@linux.intel.com>. (From OE-Core rev: c7c63bea2a099074f7158c8236cc7ad6402dbd78) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bluez5')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc13
1 files changed, 10 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 36a606195e..2fae7fbccc 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -6,12 +6,13 @@ LICENSE = "GPLv2+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
7 file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ 7 file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
8 file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e" 8 file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e"
9DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck libical readline" 9DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline"
10 10
11RCONFLICTS_${PN} = "bluez4" 11RCONFLICTS_${PN} = "bluez4"
12 12
13PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 13PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} obex-profiles"
14PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" 14PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
15PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
15 16
16SRC_URI = "\ 17SRC_URI = "\
17 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ 18 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
@@ -53,7 +54,7 @@ do_install_append() {
53} 54}
54 55
55ALLOW_EMPTY_libasound-module-bluez = "1" 56ALLOW_EMPTY_libasound-module-bluez = "1"
56PACKAGES =+ "libasound-module-bluez ${PN}-test" 57PACKAGES =+ "libasound-module-bluez ${PN}-test ${PN}-obex"
57 58
58FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" 59FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
59FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1" 60FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
@@ -62,6 +63,12 @@ FILES_${PN}-dev += "\
62 ${libdir}/alsa-lib/*.la \ 63 ${libdir}/alsa-lib/*.la \
63" 64"
64 65
66FILES_${PN}-obex = "${libdir}/bluez5/bluetooth/obexd \
67 ${libdir}/systemd/user/obex.service \
68 ${datadir}/dbus-1/services/org.bluez.obex.service \
69 "
70SYSTEMD_SERVICE_${PN}-obex = "obex.service"
71
65FILES_${PN}-test = "${libdir}/bluez/test/*" 72FILES_${PN}-test = "${libdir}/bluez/test/*"
66 73
67FILES_${PN}-dbg += "\ 74FILES_${PN}-dbg += "\