summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc9
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5_5.44.bb (renamed from meta/recipes-connectivity/bluez5/bluez5_5.43.bb)23
2 files changed, 24 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index ed75db2113..11cf8fb8ec 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -14,8 +14,8 @@ RCONFLICTS_${PN} = "bluez4"
14 14
15PACKAGECONFIG ??= "obex-profiles readline" 15PACKAGECONFIG ??= "obex-profiles readline"
16PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" 16PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
17PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental,"
18PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," 17PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
18PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
19 19
20SRC_URI = "\ 20SRC_URI = "\
21 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ 21 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
@@ -31,6 +31,7 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest
31 31
32EXTRA_OECONF = "\ 32EXTRA_OECONF = "\
33 --enable-tools \ 33 --enable-tools \
34 --enable-deprecated \
34 --disable-cups \ 35 --disable-cups \
35 --enable-test \ 36 --enable-test \
36 --enable-datafiles \ 37 --enable-datafiles \
@@ -41,10 +42,12 @@ EXTRA_OECONF = "\
41# bluez5 builds a large number of useful utilities but does not 42# bluez5 builds a large number of useful utilities but does not
42# install them. Specify which ones we want put into ${PN}-noinst-tools. 43# install them. Specify which ones we want put into ${PN}-noinst-tools.
43NOINST_TOOLS_READLINE ??= "" 44NOINST_TOOLS_READLINE ??= ""
44NOINST_TOOLS_EXPERIMENTAL ??= "" 45NOINST_TOOLS_TESTING ??= ""
46NOINST_TOOLS_BT ??= ""
45NOINST_TOOLS = " \ 47NOINST_TOOLS = " \
46 ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \ 48 ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \
47 ${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \ 49 ${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \
50 ${NOINST_TOOLS_BT} \
48" 51"
49 52
50do_install_append() { 53do_install_append() {
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb
index e10b82dd6f..1095f88dbc 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb
@@ -2,8 +2,8 @@ require bluez5.inc
2 2
3REQUIRED_DISTRO_FEATURES = "bluez5" 3REQUIRED_DISTRO_FEATURES = "bluez5"
4 4
5SRC_URI[md5sum] = "698def88df96840dfbb0858bb6d73350" 5SRC_URI[md5sum] = "94273617129ced06612fcb9f5273d14c"
6SRC_URI[sha256sum] = "16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15" 6SRC_URI[sha256sum] = "0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85"
7 7
8# noinst programs in Makefile.tools that are conditional on READLINE 8# noinst programs in Makefile.tools that are conditional on READLINE
9# support 9# support
@@ -16,12 +16,13 @@ NOINST_TOOLS_READLINE ?= " \
16 tools/btmgmt \ 16 tools/btmgmt \
17" 17"
18 18
19# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL 19# noinst programs in Makefile.tools that are conditional on TESTING
20# support 20# support
21NOINST_TOOLS_EXPERIMENTAL ?= " \ 21NOINST_TOOLS_TESTING ?= " \
22 emulator/btvirt \ 22 emulator/btvirt \
23 emulator/b1ee \ 23 emulator/b1ee \
24 emulator/hfp \ 24 emulator/hfp \
25 peripheral/btsensor \
25 tools/3dsp \ 26 tools/3dsp \
26 tools/mgmt-tester \ 27 tools/mgmt-tester \
27 tools/gap-tester \ 28 tools/gap-tester \
@@ -30,6 +31,13 @@ NOINST_TOOLS_EXPERIMENTAL ?= " \
30 tools/smp-tester \ 31 tools/smp-tester \
31 tools/hci-tester \ 32 tools/hci-tester \
32 tools/rfcomm-tester \ 33 tools/rfcomm-tester \
34 tools/bnep-tester \
35 tools/userchan-tester \
36"
37
38# noinst programs in Makefile.tools that are conditional on TOOLS
39# support
40NOINST_TOOLS_BT ?= " \
33 tools/bdaddr \ 41 tools/bdaddr \
34 tools/avinfo \ 42 tools/avinfo \
35 tools/avtest \ 43 tools/avtest \
@@ -39,17 +47,22 @@ NOINST_TOOLS_EXPERIMENTAL ?= " \
39 tools/hcieventmask \ 47 tools/hcieventmask \
40 tools/hcisecfilter \ 48 tools/hcisecfilter \
41 tools/btinfo \ 49 tools/btinfo \
42 tools/btattach \
43 tools/btsnoop \ 50 tools/btsnoop \
44 tools/btproxy \ 51 tools/btproxy \
45 tools/btiotest \ 52 tools/btiotest \
53 tools/bneptest \
46 tools/mcaptest \ 54 tools/mcaptest \
47 tools/cltest \ 55 tools/cltest \
48 tools/oobtest \ 56 tools/oobtest \
49 tools/seq2bseq \ 57 tools/seq2bseq \
58 tools/nokfw \
59 tools/create-image \
60 tools/eddystone \
50 tools/ibeacon \ 61 tools/ibeacon \
51 tools/btgatt-client \ 62 tools/btgatt-client \
52 tools/btgatt-server \ 63 tools/btgatt-server \
64 tools/test-runner \
65 tools/check-selftest \
53 tools/gatt-service \ 66 tools/gatt-service \
54 profiles/iap/iapd \ 67 profiles/iap/iapd \
55" 68"