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 | |
| 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>
4 files changed, 9 insertions, 14 deletions
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 \ " 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 9a63b38b48..9edceb5e49 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 @@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ 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)}" +DEPENDS = "obexd gnome-doc-utils-native gnome-doc-utils gconf gtk+ dbus-glib libunique libnotify gnome-keyring virtual/libx11 libxi intltool-native" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" inherit gnomebase gtk-icon-cache diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb index 99448d052e..c2c284e93d 100644 --- a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb +++ b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb @@ -2,10 +2,8 @@ DESCRIPTION = "obex-data-server is a D-Bus service providing high-level OBEX cli LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "gtk+ bluez4 dbus-glib imagemagick openobex" -RCONFLICTS_${PN} = "bluez5" - -PNBLACKLIST[obex-data-server] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}" +DEPENDS = "gtk+ dbus-glib imagemagick openobex" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz" SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d" diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb index ed3d6b2318..6ac7905989 100644 --- a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb +++ b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb @@ -2,14 +2,14 @@ DESCRIPTION = "The Openobex project is an open source implementation of the \ Object Exchange (OBEX) protocol." HOMEPAGE = "http://openobex.triq.net" SECTION = "libs" -DEPENDS = "virtual/libusb0 bluez4" +DEPENDS = "virtual/libusb0" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" + LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " -PNBLACKLIST[openobex] ?= "${@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/openobex-${PV}.tar.gz \ file://disable-cable-test.patch \ file://libusb_crosscompile_check.patch \ |