[meta-opie][PATCH 1/2] opie-securityplugin-blueping: fix bluez dependencies

[meta-opie][PATCH 1/2] opie-securityplugin-blueping: fix bluez dependencies

[Dmitry Eremin-Solenikov]

Make it runtime depend on either bluez4 or bluez5 depending on DISTRO_FEATURES.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 recipes-opie/opie-securityplugins/opie-securityplugin-blueping.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-opie/opie-securityplugins/opie-securityplugin-blueping.inc b/recipes-opie/opie-securityplugins/opie-securityplugin-blueping.inc
index aba3305..4a8ef12 100644
--- a/recipes-opie/opie-securityplugins/opie-securityplugin-blueping.inc
+++ b/recipes-opie/opie-securityplugins/opie-securityplugin-blueping.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Blueping plugin for opie-security authentication. \
 This is a bluetooth-based authentication plugin (you need \
 to have another Bluetooth device around to use it)."
-RDEPENDS_${PN} += "bluez4"
+RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
 APPNAME = "multiauthbluepingplugin"
 
 include opie-securityplugin.inc
-- 
2.1.4

[meta-opie][PATCH 2/2] packagegroup-opie: fix bluez dependencies

[Dmitry Eremin-Solenikov]

Make it runtime depend on either bluez4 or bluez5 depending on DISTRO_FEATURES.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 recipes-opie/packagegroups/packagegroup-opie.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-opie/packagegroups/packagegroup-opie.bb b/recipes-opie/packagegroups/packagegroup-opie.bb
index 42568aa..50122a0 100644
--- a/recipes-opie/packagegroups/packagegroup-opie.bb
+++ b/recipes-opie/packagegroups/packagegroup-opie.bb
@@ -91,7 +91,8 @@ RDEPENDS_packagegroup-opie-base-pim = "opie-addressbook opie-datebook opie-drawp
                       packagegroup-opie-base-todayplugins \
                       opie-datebook-birthdayplugin"
 
-RDEPENDS_packagegroup-opie-bluetooth = "bluez4 obexftp obexpush libopieobex0 \
+BLUEZ = "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
+RDEPENDS_packagegroup-opie-bluetooth = "${BLUEZ} obexftp obexpush libopieobex0 \
                        opie-bluetoothmanager opie-bluetoothapplet"
 
 RDEPENDS_packagegroup-opie-irda = "irda-utils libopieobex0 obexftp obexpush"
-- 
2.1.4