diff options
| author | Marc Ferland <ferlandm@amotus.ca> | 2017-04-25 10:48:35 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-16 14:08:16 +0100 |
| commit | 8b433f49c8ea153f75d986e5b9ad89dd3f625cba (patch) | |
| tree | 3bd2c37ad0d02511c2c179aa3ff7d2722c1f0849 /meta | |
| parent | dec3620bd13d43575bcfc5d99f40659672d7252b (diff) | |
| download | openembedded-core-8b433f49c8ea153f75d986e5b9ad89dd3f625cba.tar.gz openembedded-core-8b433f49c8ea153f75d986e5b9ad89dd3f625cba.tar.bz2 openembedded-core-8b433f49c8ea153f75d986e5b9ad89dd3f625cba.zip | |
bluez5: remove libasound-module references
Cleanup references to libasound-module since this code has been
completly removed from Bluez.
Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/distro/include/default-providers.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-base.bb | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index ece4d8b300..e1cb2f92af 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -46,7 +46,6 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" PREFERRED_PROVIDER_console-tools ?= "kbd" PREFERRED_PROVIDER_gzip-native ?= "pigz-native" PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" -PREFERRED_RPROVIDER_libasound-module-bluez ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}" PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb PREFERRED_PROVIDER_ltp ?= "ltp" diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 11cf8fb8ec..4244fc895b 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -79,14 +79,11 @@ do_install_append() { 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" +PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" -FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" FILES_${PN}-dev += "\ ${libdir}/bluetooth/plugins/*.la \ - ${libdir}/alsa-lib/*.la \ " FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 0069e3e0f7..f9e6e2edd8 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -204,7 +204,7 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\ SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" RDEPENDS_packagegroup-base-bluetooth = "\ ${BLUEZ} \ - ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \ + ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', bb.utils.contains('BLUEZ', 'bluez4', 'libasound-module-bluez', '', d), '',d)} \ " RRECOMMENDS_packagegroup-base-bluetooth = "\ |