diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-07-12 10:48:13 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-15 09:29:59 +0100 |
commit | a9bbda96ebebe9b7b57afdb96f0606c207835d7b (patch) | |
tree | 1c21694ad877b6739d676f2be00c37ddfb2192db /meta/recipes-core | |
parent | 7a6b2ce603a44db60a3ba7a4a62ec3c04c1db656 (diff) | |
download | poky-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/recipes-core')
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-base.bb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index d05403635c..1f802da09b 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb | |||
@@ -7,7 +7,6 @@ PR = "r83" | |||
7 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 7 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
8 | 8 | ||
9 | inherit packagegroup | 9 | inherit packagegroup |
10 | inherit bluetooth | ||
11 | 10 | ||
12 | PROVIDES = "${PACKAGES}" | 11 | PROVIDES = "${PACKAGES}" |
13 | PACKAGES = ' \ | 12 | PACKAGES = ' \ |
@@ -199,8 +198,7 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\ | |||
199 | 198 | ||
200 | SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" | 199 | SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" |
201 | RDEPENDS_packagegroup-base-bluetooth = "\ | 200 | RDEPENDS_packagegroup-base-bluetooth = "\ |
202 | ${BLUEZ} \ | 201 | bluez5 \ |
203 | ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', bb.utils.contains('BLUEZ', 'bluez4', 'libasound-module-bluez', '', d), '',d)} \ | ||
204 | " | 202 | " |
205 | 203 | ||
206 | RRECOMMENDS_packagegroup-base-bluetooth = "\ | 204 | RRECOMMENDS_packagegroup-base-bluetooth = "\ |