summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarc Ferland <ferlandm@amotus.ca>2017-04-25 10:48:35 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-16 14:08:29 +0100
commita104bde188914947204cc77ef44e5939790ec695 (patch)
tree865ab528356e619372f63ec7f646706465815f06 /meta
parentfeacb428b055fd714eb1b15402023f4a726dce54 (diff)
downloadpoky-a104bde188914947204cc77ef44e5939790ec695.tar.gz
bluez5: remove libasound-module references
Cleanup references to libasound-module since this code has been completly removed from Bluez. (From OE-Core rev: 8b433f49c8ea153f75d986e5b9ad89dd3f625cba) Signed-off-by: Marc Ferland <ferlandm@amotus.ca> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/default-providers.inc1
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc5
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-base.bb2
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"
46PREFERRED_PROVIDER_console-tools ?= "kbd" 46PREFERRED_PROVIDER_console-tools ?= "kbd"
47PREFERRED_PROVIDER_gzip-native ?= "pigz-native" 47PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
48PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" 48PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}"
49PREFERRED_RPROVIDER_libasound-module-bluez ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}"
50PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" 49PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}"
51# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb 50# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
52PREFERRED_PROVIDER_ltp ?= "ltp" 51PREFERRED_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() {
79 sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* 79 sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
80} 80}
81 81
82ALLOW_EMPTY_libasound-module-bluez = "1" 82PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
83PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
84 83
85FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
86FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" 84FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1"
87FILES_${PN}-dev += "\ 85FILES_${PN}-dev += "\
88 ${libdir}/bluetooth/plugins/*.la \ 86 ${libdir}/bluetooth/plugins/*.la \
89 ${libdir}/alsa-lib/*.la \
90" 87"
91 88
92FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ 89FILES_${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 = "\
204SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" 204SUMMARY_packagegroup-base-bluetooth = "Bluetooth support"
205RDEPENDS_packagegroup-base-bluetooth = "\ 205RDEPENDS_packagegroup-base-bluetooth = "\
206 ${BLUEZ} \ 206 ${BLUEZ} \
207 ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \ 207 ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', bb.utils.contains('BLUEZ', 'bluez4', 'libasound-module-bluez', '', d), '',d)} \
208 " 208 "
209 209
210RRECOMMENDS_packagegroup-base-bluetooth = "\ 210RRECOMMENDS_packagegroup-base-bluetooth = "\