summaryrefslogtreecommitdiffstats
path: root/meta/conf/bitbake.conf
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-07-12 10:48:13 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-15 09:29:59 +0100
commita9bbda96ebebe9b7b57afdb96f0606c207835d7b (patch)
tree1c21694ad877b6739d676f2be00c37ddfb2192db /meta/conf/bitbake.conf
parent7a6b2ce603a44db60a3ba7a4a62ec3c04c1db656 (diff)
downloadpoky-a9bbda96ebebe9b7b57afdb96f0606c207835d7b.tar.gz
meta: Remove remnants of bluez4 support
bluez4 was removed from meta-oe 2 years ago. Simplfy the setup of the two level bluetooth and bluez4/bluez5 distro features by removing the bluez4/bluez5 distro features. This also removes the no longer required bluetooth class. (From OE-Core rev: dcf889e93401f7c4de0055d53271eacc3882eccc) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 5e93f5c223..140f45b895 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -839,7 +839,7 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
839DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation" 839DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
840DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation" 840DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
841 841
842DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5 gobject-introspection-data ldconfig" 842DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"
843MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" 843MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
844 844
845COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" 845COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}"