diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-connectivity/bluez5')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5.inc | 17 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/init | 2 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch | 26 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5_5.41.bb (renamed from import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5_5.37.bb) | 6 |
4 files changed, 43 insertions, 8 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5.inc b/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5.inc index a508229a3..ecefb7b59 100644 --- a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5.inc @@ -18,6 +18,7 @@ PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental," SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ + file://out-of-tree.patch \ file://init \ file://run-ptest \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ @@ -25,7 +26,7 @@ SRC_URI = "\ " S = "${WORKDIR}/bluez-${PV}" -inherit autotools-brokensep pkgconfig systemd update-rc.d distro_features_check ptest +inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest EXTRA_OECONF = "\ --enable-tools \ @@ -60,17 +61,25 @@ do_install_append() { install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ fi + if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then + sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth + fi + # Install desired tools that upstream leaves in build area for f in ${NOINST_TOOLS} ; do install -m 755 ${B}/$f ${D}/${bindir} done + + # Patch python tools to use Python 3; they should be source compatible, but + # still refer to Python 2 in the shebang + sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* } ALLOW_EMPTY_libasound-module-bluez = "1" PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools" FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" -FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1" +FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" FILES_${PN}-dev += "\ ${libdir}/bluetooth/plugins/*.la \ ${libdir}/alsa-lib/*.la \ @@ -94,7 +103,7 @@ def get_noinst_tools_paths (d, bb, tools): FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS', True))}" -RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject" +RDEPENDS_${PN}-testtools += "python3 python3-dbus python3-pygobject" SYSTEMD_SERVICE_${PN} = "bluetooth.service" INITSCRIPT_PACKAGES = "${PN}" @@ -108,5 +117,5 @@ do_compile_ptest() { do_install_ptest() { cp -r ${B}/unit/ ${D}${PTEST_PATH} - rm ${D}${PTEST_PATH}/unit/*.c ${D}${PTEST_PATH}/unit/*.o + rm -f ${D}${PTEST_PATH}/unit/*.o } diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/init b/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/init index 1606a5c66..489e9b9eb 100644 --- a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/init +++ b/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/init @@ -3,7 +3,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin DESC=bluetooth -DAEMON=/usr/lib/bluez5/bluetooth/bluetoothd +DAEMON=@LIBEXECDIR@/bluetooth/bluetoothd # If you want to be ignore error of "org.freedesktop.hostname1", # please enable NOPLUGIN_OPTION. diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch b/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch new file mode 100644 index 000000000..3ee79d704 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch @@ -0,0 +1,26 @@ +From ed55b49a226ca3909f52416be2ae5ce1c5ca2cb2 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Fri, 22 Apr 2016 15:40:37 +0100 +Subject: [PATCH] Makefile.obexd: add missing mkdir in builtin.h generation + +In parallel out-of-tree builds it's possible that obexd/src/builtin.h is +generated before the target directory has been implicitly created. Solve this by +creating the directory before writing into it. + +Upstream-Status: Submitted +Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + Makefile.obexd | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.obexd b/Makefile.obexd +index 2e33cbc..c8286f0 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -105,2 +105,3 @@ obexd/src/plugin.$(OBJEXT): obexd/src/builtin.h + obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources) ++ $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@ +-- +2.8.0.rc3 + diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5_5.37.bb b/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5_5.41.bb index db20f79ff..522aab7d5 100644 --- a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5_5.37.bb +++ b/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5_5.41.bb @@ -2,8 +2,8 @@ require bluez5.inc REQUIRED_DISTRO_FEATURES = "bluez5" -SRC_URI[md5sum] = "33177e5743e24b2b3738f72be64e3ffb" -SRC_URI[sha256sum] = "c14ba9ddcb0055522073477b8fd8bf1ddf5d219e75fdfd4699b7e0ce5350d6b0" +SRC_URI[md5sum] = "318341b2188698130adb73236ee69244" +SRC_URI[sha256sum] = "df7dc4462494dad4e60a2943240d584f6e760235dca64f5f10eba46dbab7f5f0" # noinst programs in Makefile.tools that are conditional on READLINE # support @@ -13,6 +13,7 @@ NOINST_TOOLS_READLINE ?= " \ tools/obex-server-tool \ tools/bluetooth-player \ tools/obexctl \ + tools/btmgmt \ " # noinst programs in Makefile.tools that are conditional on EXPERIMENTAL @@ -37,7 +38,6 @@ NOINST_TOOLS_EXPERIMENTAL ?= " \ tools/hwdb \ tools/hcieventmask \ tools/hcisecfilter \ - tools/btmgmt \ tools/btinfo \ tools/btattach \ tools/btsnoop \ |