summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc26
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5_5.25.bb46
2 files changed, 71 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index f782528c86..d9b649258e 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -32,6 +32,15 @@ EXTRA_OECONF = "\
32 --enable-library \ 32 --enable-library \
33" 33"
34 34
35# bluez5 builds a large number of useful utilities but does not
36# install them. Specify which ones we want put into ${PN}-noinst-tools.
37NOINST_TOOLS_READLINE ??= ""
38NOINST_TOOLS_EXPERIMENTAL ??= ""
39NOINST_TOOLS = " \
40 ${NOINST_TOOLS_READLINE} \
41 ${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \
42"
43
35do_install_append() { 44do_install_append() {
36 install -d ${D}${sysconfdir}/bluetooth/ 45 install -d ${D}${sysconfdir}/bluetooth/
37 if [ -f ${S}/profiles/audio/audio.conf ]; then 46 if [ -f ${S}/profiles/audio/audio.conf ]; then
@@ -45,10 +54,15 @@ do_install_append() {
45 fi 54 fi
46 # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT 55 # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
47 install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ 56 install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
57
58 # Install desired tools that upstream leaves in build area
59 for f in ${NOINST_TOOLS} ; do
60 install -m 755 ${B}/$f ${D}/${bindir}
61 done
48} 62}
49 63
50ALLOW_EMPTY_libasound-module-bluez = "1" 64ALLOW_EMPTY_libasound-module-bluez = "1"
51PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex" 65PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
52 66
53FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" 67FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
54FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1" 68FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
@@ -65,6 +79,16 @@ SYSTEMD_SERVICE_${PN}-obex = "obex.service"
65 79
66FILES_${PN}-testtools = "${libdir}/bluez/test/*" 80FILES_${PN}-testtools = "${libdir}/bluez/test/*"
67 81
82def get_noinst_tools_paths (d, bb, tools):
83 s = list()
84 bindir = d.getVar("bindir", True)
85 for bdp in tools.split():
86 f = os.path.basename(bdp)
87 s.append("%s/%s" % (bindir, f))
88 return "\n".join(s)
89
90FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS', True))}"
91
68FILES_${PN}-dbg += "\ 92FILES_${PN}-dbg += "\
69 ${libdir}/${BPN}/bluetooth/.debug \ 93 ${libdir}/${BPN}/bluetooth/.debug \
70 ${libdir}/bluetooth/plugins/.debug \ 94 ${libdir}/bluetooth/plugins/.debug \
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.25.bb b/meta/recipes-connectivity/bluez5/bluez5_5.25.bb
index ec58857f38..7d06b16549 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.25.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.25.bb
@@ -2,3 +2,49 @@ require bluez5.inc
2SRC_URI[md5sum] = "41bd0c915abde255622150ce6dcae67b" 2SRC_URI[md5sum] = "41bd0c915abde255622150ce6dcae67b"
3SRC_URI[sha256sum] = "5ca62f3f45e2638a0f7a81658d6c8813ee01487436ae8e53e9fe395e23d1fd30" 3SRC_URI[sha256sum] = "5ca62f3f45e2638a0f7a81658d6c8813ee01487436ae8e53e9fe395e23d1fd30"
4 4
5# noinst programs in Makefile.tools that are conditional on READLINE
6# support
7NOINST_TOOLS_READLINE ?= " \
8 attrib/gatttool \
9 tools/obex-client-tool \
10 tools/obex-server-tool \
11 tools/bluetooth-player \
12 tools/obexctl \
13"
14
15# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL
16# support
17NOINST_TOOLS_EXPERIMENTAL ?= " \
18 emulator/btvirt \
19 emulator/b1ee \
20 emulator/hfp \
21 tools/3dsp \
22 tools/mgmt-tester \
23 tools/gap-tester \
24 tools/l2cap-tester \
25 tools/sco-tester \
26 tools/smp-tester \
27 tools/hci-tester \
28 tools/rfcomm-tester \
29 tools/bdaddr \
30 tools/avinfo \
31 tools/avtest \
32 tools/scotest \
33 tools/amptest \
34 tools/hwdb \
35 tools/hcieventmask \
36 tools/hcisecfilter \
37 tools/btmgmt \
38 tools/btinfo \
39 tools/btattach \
40 tools/btsnoop \
41 tools/btproxy \
42 tools/btiotest \
43 tools/cltest \
44 tools/seq2bseq \
45 tools/hex2hcd \
46 tools/ibeacon \
47 tools/btgatt-client \
48 tools/gatt-service \
49 profiles/iap/iapd \
50"