summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-07-30 14:48:34 +0100
committerSaul Wold <sgw@linux.intel.com>2013-08-01 21:57:53 -0700
commitc7c63bea2a099074f7158c8236cc7ad6402dbd78 (patch)
tree8285340612ae9fdc8c44613d0e29ff0abaf7091d /meta/recipes-connectivity
parent4c8dd1ef13ccaf90cfb521416afd45da48c96a61 (diff)
downloadopenembedded-core-c7c63bea2a099074f7158c8236cc7ad6402dbd78.tar.gz
openembedded-core-c7c63bea2a099074f7158c8236cc7ad6402dbd78.tar.bz2
openembedded-core-c7c63bea2a099074f7158c8236cc7ad6402dbd78.zip
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>. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
-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+"
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e"
-DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck libical readline"
+DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline"
RCONFLICTS_${PN} = "bluez4"
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} obex-profiles"
PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
+PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
SRC_URI = "\
${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
@@ -53,7 +54,7 @@ do_install_append() {
}
ALLOW_EMPTY_libasound-module-bluez = "1"
-PACKAGES =+ "libasound-module-bluez ${PN}-test"
+PACKAGES =+ "libasound-module-bluez ${PN}-test ${PN}-obex"
FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
FILES_${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 += "\
${libdir}/alsa-lib/*.la \
"
+FILES_${PN}-obex = "${libdir}/bluez5/bluetooth/obexd \
+ ${libdir}/systemd/user/obex.service \
+ ${datadir}/dbus-1/services/org.bluez.obex.service \
+ "
+SYSTEMD_SERVICE_${PN}-obex = "obex.service"
+
FILES_${PN}-test = "${libdir}/bluez/test/*"
FILES_${PN}-dbg += "\