[oe-commits] [meta-openembedded] 16/31: obexftp: mark as compatible with bluez5

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 71e85b1d820ee386ebd0e826e7a1f396cbbe1def
Author: Andrea Adami <andrea.adami at gmail.com>
AuthorDate: Thu May 12 00:22:40 2016 +0200

    obexftp: mark as compatible with bluez5
    
    Fix opie-image:
    ERROR: Nothing PROVIDES 'obexftp'
    ERROR: obexftp was skipped: Recipe is blacklisted: bluez5 conflicts with
     bluez4 and bluez5 is selected in DISTRO_FEATURES
    
    Somehow on 2015-05-11 obex* had been blacklisted and on the same day Dmitry
    sent the patches #93471 and #93473.
    Openobex was then fixed (bluez 4 vs. 5 ) with commit id
    3d6d36d24b9d8baa92ecd2a5a7657b56f00383b0.
    
    Originally
    Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin at mentor.com>
    
    Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb b/meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb
index fcd447c..b6bdfb7 100644
--- a/meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb
+++ b/meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb
@@ -4,9 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 DEPENDS += "openobex"
 
-# Depends on openobex
-PNBLACKLIST[obexftp] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
-
 SRC_URI = "http://sourceforge.net/projects/openobex/files/obexftp/${PV}/obexftp-${PV}.tar.bz2 \
            file://Remove_some_printf_in_obexftpd.patch "
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.