From 569b11c6e3eb5c7aa6c1d0d76c37ec36c2ce3631 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 12 May 2016 00:22:40 +0200 Subject: 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 Signed-off-by: Andrea Adami Signed-off-by: Martin Jansa --- meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb | 3 --- 1 file changed, 3 deletions(-) (limited to 'meta-oe/recipes-connectivity') diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb b/meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb index fcd447cc7..b6bdfb7e4 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 " -- cgit v1.2.3-54-g00ecf