diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-05-11 18:24:53 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-17 09:46:28 +0200 |
commit | 3d6d36d24b9d8baa92ecd2a5a7657b56f00383b0 (patch) | |
tree | 5cdb28f52376d64e9adf160c1223a6b45b8b5ec9 /meta-gnome/recipes-connectivity | |
parent | 8da812fbb68a3ecfd7c950e087e97a6ca55fe394 (diff) | |
download | meta-openembedded-3d6d36d24b9d8baa92ecd2a5a7657b56f00383b0.tar.gz |
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 <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-connectivity')
-rw-r--r-- | meta-gnome/recipes-connectivity/obex/obexd_0.48.bb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb index 6058b0466..6096bed73 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 @@ | |||
1 | SUMMARY = "OBEX Server and Client" | 1 | SUMMARY = "OBEX Server and Client" |
2 | # obexd was integrated into bluez5 | 2 | # obexd was integrated into bluez5 |
3 | DEPENDS = "glib-2.0 dbus bluez4 libical" | 3 | DEPENDS = "glib-2.0 dbus libical" |
4 | RCONFLICTS_${PN} = "bluez5" | 4 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" |
5 | 5 | ||
6 | LICENSE = "GPLv2" | 6 | LICENSE = "GPLv2" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" |
8 | 8 | ||
9 | PNBLACKLIST[obexd] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}" | ||
10 | |||
11 | SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz \ | 9 | SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz \ |
12 | file://ssize_t_definition.patch \ | 10 | file://ssize_t_definition.patch \ |
13 | " | 11 | " |