diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 9 | ||||
-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 ed75db2113c..11cf8fb8ec0 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -14,8 +14,8 @@ RCONFLICTS_${PN} = "bluez4" PACKAGECONFIG ??= "obex-profiles readline" PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" -PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental," PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline," +PACKAGECONFIG[testing] = "--enable-testing,--disable-testing" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ @@ -31,6 +31,7 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest EXTRA_OECONF = "\ --enable-tools \ + --enable-deprecated \ --disable-cups \ --enable-test \ --enable-datafiles \ @@ -41,10 +42,12 @@ EXTRA_OECONF = "\ # bluez5 builds a large number of useful utilities but does not # install them. Specify which ones we want put into ${PN}-noinst-tools. NOINST_TOOLS_READLINE ??= "" -NOINST_TOOLS_EXPERIMENTAL ??= "" +NOINST_TOOLS_TESTING ??= "" +NOINST_TOOLS_BT ??= "" NOINST_TOOLS = " \ ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \ + ${NOINST_TOOLS_BT} \ " do_install_append() { diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb index e10b82dd6f6..1095f88dbc1 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 REQUIRED_DISTRO_FEATURES = "bluez5" -SRC_URI[md5sum] = "698def88df96840dfbb0858bb6d73350" -SRC_URI[sha256sum] = "16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15" +SRC_URI[md5sum] = "94273617129ced06612fcb9f5273d14c" +SRC_URI[sha256sum] = "0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85" # noinst programs in Makefile.tools that are conditional on READLINE # support @@ -16,12 +16,13 @@ NOINST_TOOLS_READLINE ?= " \ tools/btmgmt \ " -# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL +# noinst programs in Makefile.tools that are conditional on TESTING # support -NOINST_TOOLS_EXPERIMENTAL ?= " \ +NOINST_TOOLS_TESTING ?= " \ emulator/btvirt \ emulator/b1ee \ emulator/hfp \ + peripheral/btsensor \ tools/3dsp \ tools/mgmt-tester \ tools/gap-tester \ @@ -30,6 +31,13 @@ NOINST_TOOLS_EXPERIMENTAL ?= " \ tools/smp-tester \ tools/hci-tester \ tools/rfcomm-tester \ + tools/bnep-tester \ + tools/userchan-tester \ +" + +# noinst programs in Makefile.tools that are conditional on TOOLS +# support +NOINST_TOOLS_BT ?= " \ tools/bdaddr \ tools/avinfo \ tools/avtest \ @@ -39,17 +47,22 @@ NOINST_TOOLS_EXPERIMENTAL ?= " \ tools/hcieventmask \ tools/hcisecfilter \ tools/btinfo \ - tools/btattach \ tools/btsnoop \ tools/btproxy \ tools/btiotest \ + tools/bneptest \ tools/mcaptest \ tools/cltest \ tools/oobtest \ tools/seq2bseq \ + tools/nokfw \ + tools/create-image \ + tools/eddystone \ tools/ibeacon \ tools/btgatt-client \ tools/btgatt-server \ + tools/test-runner \ + tools/check-selftest \ tools/gatt-service \ profiles/iap/iapd \ " |