--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 <[email protected]>. Signed-off-by: Ross Burton <[email protected]> --- meta/classes/buildhistory.bbclass | 1 + meta/recipes-connectivity/bluez5/bluez5.inc | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 36e7fe1..c5bba25 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -531,6 +531,7 @@ END python buildhistory_eventhandler() { if e.data.getVar('BUILDHISTORY_FEATURES', True).strip(): if e.data.getVar("BUILDHISTORY_COMMIT", True) == "1": + bb.note("Writing buildhistory") bb.build.exec_func("buildhistory_commit", e.data) } diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index fc78900..6ab05cf 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 \ @@ -47,7 +48,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" @@ -56,6 +57,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 += "\ -- 1.7.10.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
