From 3d6d36d24b9d8baa92ecd2a5a7657b56f00383b0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 11 May 2015 18:24:53 -0700 Subject: obex, gnome-bluetooth: Make bluez{4, 5} dep conditional on DISTRO_FEATURE bluez4 is removed from oe-core This helps in compiling them when distro features are either set to use bluez4 or bluez5 Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- meta-gnome/recipes-connectivity/obex/obexd_0.48.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'meta-gnome/recipes-connectivity') diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb index 6058b04662..6096bed735 100644 --- a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb +++ b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb @@ -1,13 +1,11 @@ SUMMARY = "OBEX Server and Client" # obexd was integrated into bluez5 -DEPENDS = "glib-2.0 dbus bluez4 libical" -RCONFLICTS_${PN} = "bluez5" +DEPENDS = "glib-2.0 dbus libical" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" 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 \ " -- cgit v1.2.3-54-g00ecf