diff options
-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" | |||
46 | PREFERRED_PROVIDER_console-tools ?= "kbd" | 46 | PREFERRED_PROVIDER_console-tools ?= "kbd" |
47 | PREFERRED_PROVIDER_gzip-native ?= "pigz-native" | 47 | PREFERRED_PROVIDER_gzip-native ?= "pigz-native" |
48 | PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" | 48 | PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" |
49 | PREFERRED_RPROVIDER_libasound-module-bluez ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}" | ||
50 | PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" | 49 | PREFERRED_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 |
52 | PREFERRED_PROVIDER_ltp ?= "ltp" | 51 | 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() { | |||
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 | ||
82 | ALLOW_EMPTY_libasound-module-bluez = "1" | 82 | PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" |
83 | PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools" | ||
84 | 83 | ||
85 | FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" | ||
86 | FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" | 84 | FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1" |
87 | FILES_${PN}-dev += "\ | 85 | FILES_${PN}-dev += "\ |
88 | ${libdir}/bluetooth/plugins/*.la \ | 86 | ${libdir}/bluetooth/plugins/*.la \ |
89 | ${libdir}/alsa-lib/*.la \ | ||
90 | " | 87 | " |
91 | 88 | ||
92 | FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ | 89 | 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 = "\ | |||
204 | SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" | 204 | SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" |
205 | RDEPENDS_packagegroup-base-bluetooth = "\ | 205 | RDEPENDS_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 | ||
210 | RRECOMMENDS_packagegroup-base-bluetooth = "\ | 210 | RRECOMMENDS_packagegroup-base-bluetooth = "\ |