diff options
| author |   Walt Miner <wminer@linuxfoundation.org> | 2015-10-23 15:03:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.200> | 2015-10-23 15:03:34 +0000 |
| commit | 7d9331c81f8a7a15ae6371bc5f23570b8ca7b5d1 (patch) | |
| tree | 51950a6a274b701a9a10f642fdef247888fdf89b | |
| parent | ec84dcf85012b9dd07fa2300a46865ad4cdafa0d (diff) | |
| parent | 4c01095f8de7ce06157c27dfda648ef10ff60cfc (diff) | |
Merge "Provide Bluetooth and BlueZ 5"
| -rw-r--r-- | meta-agl/conf/distro/poky-agl.conf | 2 | ||||
| -rw-r--r-- | meta-agl/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend | 6 |
2 files changed, 7 insertions, 1 deletions
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)}" |