[CONSOLIDATED PULL 26/27] ofono: conditionally enable bluetooth

Openembedded Core Discussions
 help / color / mirror / Atom feed

From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [CONSOLIDATED PULL 26/27] ofono: conditionally enable bluetooth
Date: Tue, 16 Aug 2011 23:26:49 -0700	[thread overview]
Message-ID: <23dc421a0943b13259fe4d86086427bdde8c1ade.1313560883.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1313560883.git.sgw@linux.intel.com>
In-Reply-To: <cover.1313560883.git.sgw@linux.intel.com>

From: Anders Darander <anders@chargestorm.se>

Use DISTRO_FEATURE to conditionally depend on bluez4, as well as enabling bluetooth.

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta/recipes-connectivity/ofono/ofono.inc     |    3 ++-
 meta/recipes-connectivity/ofono/ofono_0.50.bb |    1 +
 meta/recipes-connectivity/ofono/ofono_git.bb  |    4 ++++
 3 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index a14b35a..ab233dc 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 
 inherit autotools pkgconfig update-rc.d
 
-DEPENDS  = "dbus glib-2.0 udev bluez4"
+BLUEZDEPENDS = "bluez4"
+DEPENDS  = "dbus glib-2.0 udev ${@base_contains('DISTRO_FEATURES', 'bluetooth','${BLUEZDEPENDS}', '', d)}"
 
 INITSCRIPT_NAME = "ofono"
 INITSCRIPT_PARAMS = "defaults 22"
diff --git a/meta/recipes-connectivity/ofono/ofono_0.50.bb b/meta/recipes-connectivity/ofono/ofono_0.50.bb
index ef4fbf0..b679200 100644
--- a/meta/recipes-connectivity/ofono/ofono_0.50.bb
+++ b/meta/recipes-connectivity/ofono/ofono_0.50.bb
@@ -7,6 +7,7 @@ SRC_URI  = "${KERNELORG_MIRROR}/linux/network/ofono/${BPN}-${PV}.tar.bz2 \
 
 EXTRA_OECONF += "\
     --enable-test \
+    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
 "
 
 SRC_URI[md5sum] = "b2656fd0bbf33f926fc86c1e8915d697"
diff --git a/meta/recipes-connectivity/ofono/ofono_git.bb b/meta/recipes-connectivity/ofono/ofono_git.bb
index dbad5a1..f1770c2 100644
--- a/meta/recipes-connectivity/ofono/ofono_git.bb
+++ b/meta/recipes-connectivity/ofono/ofono_git.bb
@@ -10,6 +10,10 @@ PR = "r1"
 SRC_URI  = "git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \
 	    file://ofono"
 
+EXTRA_OECONF += "\
+    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
+"
+
 do_configure_prepend () {
   ${S}/bootstrap
 }
-- 
1.7.6

next prev parent reply	other threads:[~2011-08-17  6:31 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-17  6:26 [CONSOLIDATED PULL 00/27] Updates and various fixes Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 01/27] cmake.bbclass, perlnative.bbclass: arrange for cmake to find perl-native Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 02/27] libproxy: remove dependency on X libs Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 03/27] libxcb: enable native/nativesdk builds as was done previously in meta-oe Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 04/27] qemu: Make qemu buildable inside qemux86/qemuppc target Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 05/27] rootfs_rpm: Fix DEFAULTTUNE setting in multilib case Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 06/27] package_rpm: enhance strip_multilib function Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 07/27] package_rpm: Fix package rename issue in multilib case Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 08/27] gtk-icon-cache: Adding MLPREFIX when dynamically set RDEPENDS Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 09/27] linux-yocto: bump version string to 3.0.1 Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 10/27] qemu: change default kernel to 3.0.x Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 11/27] linux-yocto: meta SRCREV bump Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 12/27] package(_ipk).bbclass: opkg using ALL_MULTILIB_PACKAGE_ARCHS Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 13/27] bluez-hcidump: upgrade from 2.0 to 2.1 Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 14/27] tcf-agent: add openssl into DEPENDS Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 15/27] cronie: upgrade from 1.4.7 to 1.4.8 Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 16/27] mdadm: upgrade mdadm from 3.2.1 to 3.2.2 Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 17/27] util-macros: upgrade from 1.14.0 to the latest version 0.15.0 Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 18/27] freetype: upgrade from 2.4.4 to 2.4.6 Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 19/27] xproto: upgrade from 7.0.21 to 7.0.22 Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 20/27] glproto: upgrade from 1.4.13 to 1.4.14 Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 21/27] dri2proto: upgrade from 2.4 to 2.6 Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 22/27] distro_tracking_fields.inc: update the info for the following recipes Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 23/27] qt4: allow a reduction in build time Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 24/27] qmake_base: add uclibceabi Saul Wold
2011-08-17  6:26 ` [CONSOLIDATED PULL 25/27] connman: use DISTRO_FEATURES to enable wifi and bluetooth Saul Wold
2011-08-17  6:26 ` Saul Wold [this message]
2011-08-17  6:26 ` [CONSOLIDATED PULL 27/27] create-pull-request: increase likelihood of detecting a rename Saul Wold
2011-08-17  6:36 ` [CONSOLIDATED PULL 00/27] Updates and various fixes Anders Darander
2011-08-17 14:17 ` Richard Purdie

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:a14b35a dfblob:ab233dc dfblob:ef4fbf0 dfblob:b679200
dfblob:dbad5a1 dfblob:f1770c2 )
 OR (
bs:"[CONSOLIDATED PULL 26/27] ofono: conditionally enable bluetooth" )
	(help)

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=23dc421a0943b13259fe4d86086427bdde8c1ade.1313560883.git.sgw@linux.intel.com \
    --to=sgw@linux.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox