diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-01 12:15:51 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-11 10:27:28 +0200 |
| commit | 73ba7cd70f75a898bf4c3f8ae38c9904fc3e4724 (patch) | |
| tree | 4dbc31aa7e42aef81b503b484c39c382bdf5bf74 /meta-gnome | |
| parent | 3ad735b7e26d5f2acc7452de563db93f8d10340c (diff) | |
| download | meta-openembedded-contrib-73ba7cd70f75a898bf4c3f8ae38c9904fc3e4724.tar.gz | |
*obex*, navit, libsyncml, foxtrotgps, gypsy, bluez-hcidump, bluez4, gst-plugin-bluetooth, gnome-bluetooth: blacklist bluez4 only recipes when bluez5 is in DISTRO_FEATURES
foo
Diffstat (limited to 'meta-gnome')
| -rw-r--r-- | meta-gnome/recipes-connectivity/obex/obexd_0.48.bb | 1 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb index f28f77b8cb..6058b04662 100644 --- a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb +++ b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb @@ -6,6 +6,7 @@ RCONFLICTS_${PN} = "bluez5" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" +PNBLACKLIST[obexd] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}" SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz \ file://ssize_t_definition.patch \ diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb index 8711b8af0b..9a63b38b48 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb @@ -9,6 +9,8 @@ PR = "r1" SECTION = "x11/gnome" DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify bluez4 gnome-keyring virtual/libx11 libxi intltool-native" +PNBLACKLIST[gnome-bluetooth] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}" + inherit gnomebase gtk-icon-cache SRC_URI += " \ |