From 4c01095f8de7ce06157c27dfda648ef10ff60cfc Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Wed, 21 Oct 2015 01:21:46 +0000 Subject: Provide Bluetooth and BlueZ 5 Add "bluetooth" as an explicit DISTRO_FEATURE and, as "bluez4" is the default choice, specify "bluez5" which allows more modern features. PulseAudio from Poky 1.7 always pulls BlueZ 4 if Bluetooth is specified, thus creating build errors unless we add a workaround for it. Change-Id: I3e9f86c77f5971c0d71666f8decb7d3d3a0fdcb4 Signed-off-by: Manuel Bachmann --- meta-agl/conf/distro/poky-agl.conf | 2 +- meta-agl/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 meta-agl/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend diff --git a/meta-agl/conf/distro/poky-agl.conf b/meta-agl/conf/distro/poky-agl.conf index 0f5a1919a..58abfcd6a 100644 --- a/meta-agl/conf/distro/poky-agl.conf +++ b/meta-agl/conf/distro/poky-agl.conf @@ -19,7 +19,7 @@ VIRTUAL-RUNTIME_init_manager = "systemd" VIRTUAL-RUNTIME_initscripts = "" # Override these in poky based distros -AGL_DEFAULT_DISTRO_FEATURES = "systemd opengl wayland pam" +AGL_DEFAULT_DISTRO_FEATURES = "systemd opengl wayland pam bluetooth bluez5" AGL_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" AGL_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" diff --git a/meta-agl/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-agl/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend new file mode 100644 index 000000000..2d9f558e9 --- /dev/null +++ b/meta-agl/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend @@ -0,0 +1,6 @@ +# Prevent BlueZ 4 from being always pulled +PACKAGECONFIG_remove = "bluez4" + +# If Bluetooth is asked in DISTRO_FEATURES, verify if Bluez 5 is also +# explicitly specified. If it is not, fall back to BlueZ 4 +PACKAGECONFIG_append = "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5', 'bluez4', d), '', d)}" -- cgit 1.2.3-korg