[oe] [meta-oe][PATCH] packagegroup-meta-oe: Remove bogus bluez4 DISTRO_FEATURES checks
Adrian Bunk
bunk at stusta.de
Wed Jul 3 06:23:59 UTC 2019
These might be remnants from a time when some recipes did
not yet support bluez5.
pulseaudio support is optional in libmikmod.
mongodb does currently fail to build for unrelated reasons.
Signed-off-by: Adrian Bunk <bunk at stusta.de>
---
.../packagegroups/packagegroup-meta-oe.bb | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 619c217b7..d7e1b6e87 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -68,8 +68,8 @@ RDEPENDS_packagegroup-meta-oe-connectivity ="\
ser2net smstools3 telepathy-glib telepathy-idle thrift \
usbmuxd wvstreams zabbix zeromq \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "obex-data-server", "", d)} \
- ${@bb.utils.contains("DISTRO_FEATURES", "pulseadio bluez4", "libmikmod", "", d)} \
- ${@bb.utils.contains("DISTRO_FEATURES", "bluez4", "obexftp openobex libnet wvdial", "", d)} \
+ libmikmod \
+ obexftp openobex libnet wvdial \
"
# dracut needs dracut
@@ -99,7 +99,6 @@ RDEPENDS_packagegroup-meta-oe-dbs ="\
leveldb libdbi mariadb mariadb-native \
mysql-python postgresql psqlodbc rocksdb soci \
sqlite \
- ${@bb.utils.contains("DISTRO_FEATURES", "bluez4", "mongodb", "", d)} \
"
RDEPENDS_packagegroup-meta-oe-devtools ="\
@@ -197,7 +196,7 @@ RDEPENDS_packagegroup-meta-oe-multimedia ="\
mplayer-common opus-tools \
sound-theme-freedesktop v4l-utils yavta wavpack libvpx \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "xpext pavucontrol xsp", "", d)} \
- ${@bb.utils.contains("DISTRO_FEATURES", "pulseadio bluez4", "libmikmod", "", d)} \
+ libmikmod \
${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad faad2 mpv", "", d)} \
"
RDEPENDS_packagegroup-meta-oe-multimedia_remove_libc-musl = "alsa-oss"
@@ -249,9 +248,9 @@ RDEPENDS_packagegroup-meta-oe-support ="\
vim vim-tiny websocketpp wmiconfig xdelta3 xdg-user-dirs xmlstarlet \
zbar zile \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "geis toscoterm uim synergy utouch-mtview links-x11 fltk pidgin-otr", "", d)} \
- ${@bb.utils.contains("DISTRO_FEATURES", "pulseadio bluez4", "libcanberra", "", d)} \
+ libcanberra \
${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xorgxrdp xrdp", "", d)} \
- ${@bb.utils.contains("DISTRO_FEATURES", "bluez4", "procmail", "", d)} \
+ procmail \
${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks udisks2 upower", "", d)} \
${NE10} \
"
--
2.17.1
More information about the Openembedded-devel
mailing list