All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cristian Iorga <cristian.iorga@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 10/11] connman: depend on distro provider of bluez
Date: Mon, 16 Feb 2015 17:06:20 +0200	[thread overview]
Message-ID: <55669c769dc281c9d9c26ee68293919ce0ef0c7f.1424098977.git.cristian.iorga@intel.com> (raw)
In-Reply-To: <cover.1424098977.git.cristian.iorga@intel.com>
In-Reply-To: <cover.1424098977.git.cristian.iorga@intel.com>

From: "Peter A. Bigot" <pab@pabigot.com>

connman currently supports both bluez4 and bluez5 without distinguishing
them at configuration time.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 meta/recipes-connectivity/connman/connman.inc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 736b324..1062641 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -13,6 +13,8 @@ LICENSE  = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
                     file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36"
 
+inherit bluetooth
+
 DEPENDS  = "dbus glib-2.0 ppp iptables"
 
 INC_PR = "r20"
@@ -32,7 +34,7 @@ EXTRA_OECONF += "\
 PACKAGECONFIG ??= "wispr \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \
 "
 
@@ -42,7 +44,7 @@ PACKAGECONFIG ??= "wispr \
 
 PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
 PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
-PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4"
+PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}"
 PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"
 PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
 PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn"
@@ -114,7 +116,7 @@ RPROVIDES_${PN} = "\
 
 RDEPENDS_${PN} = "\
 	dbus \
-	${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \
+	${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', '${BLUEZ}', '', d)} \
 	${@bb.utils.contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \
 	${@bb.utils.contains('PACKAGECONFIG', '3g','ofono', '', d)} \
 	xuser-account \
-- 
2.1.0



  parent reply	other threads:[~2015-02-16 15:07 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-16 15:06 [PATCH 00/11] BlueZ 5 as bluetooth alternative stack Cristian Iorga
2015-02-16 15:06 ` [PATCH 01/11] bluetooth.bbclass: simplify recipe inference of bluetooth provider Cristian Iorga
2015-02-16 15:06 ` [PATCH 02/11] packagegroup-base: select distro preference for bluez provider Cristian Iorga
2015-02-16 15:06 ` [PATCH 03/11] pulseaudio: " Cristian Iorga
2015-02-16 15:06 ` [PATCH 04/11] qt-mobility: " Cristian Iorga
2015-02-16 15:06 ` [PATCH 05/11] neard: " Cristian Iorga
2015-02-16 15:06 ` [PATCH 06/11] libpcap: " Cristian Iorga
2015-02-16 15:06 ` [PATCH 07/11] ofono: " Cristian Iorga
2015-02-16 15:06 ` [PATCH 08/11] gstreamer1.0-plugins-bad: " Cristian Iorga
2015-02-16 15:06 ` [PATCH 09/11] conf/distro/include/default-providers: updated bluez-hcidump providers Cristian Iorga
2015-02-16 15:06 ` Cristian Iorga [this message]
2015-02-16 15:06 ` [PATCH 11/11] default-providers: Set the preferred provider for bluez based on version Cristian Iorga
2015-02-17 12:17 ` [PATCH 00/11] BlueZ 5 as bluetooth alternative stack Peter A. Bigot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=55669c769dc281c9d9c26ee68293919ce0ef0c7f.1424098977.git.cristian.iorga@intel.com \
    --to=cristian.iorga@intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.