summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorAnders Darander <anders@chargestorm.se>2011-08-17 08:41:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-17 15:18:01 +0100
commit4024bf2874e9da4fd0dd9a2b90a48e8a259781cc (patch)
tree162f2f4c2d6bfca5137c3a7334391963f1c96f48 /meta
parent3944f5e02d22b70b3bcd733a80f005dbd8e248a2 (diff)
downloadopenembedded-core-4024bf2874e9da4fd0dd9a2b90a48e8a259781cc.tar.gz
openembedded-core-4024bf2874e9da4fd0dd9a2b90a48e8a259781cc.tar.bz2
openembedded-core-4024bf2874e9da4fd0dd9a2b90a48e8a259781cc.tar.xz
openembedded-core-4024bf2874e9da4fd0dd9a2b90a48e8a259781cc.zip
ofono: conditionally enable bluetooth
Use DISTRO_FEATURE to conditionally depend on bluez4, as well as enabling bluetooth. Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/ofono/ofono.inc2
-rw-r--r--meta/recipes-connectivity/ofono/ofono_0.50.bb1
-rw-r--r--meta/recipes-connectivity/ofono/ofono_git.bb4
3 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index a14b35a84..0b1a6e123 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
inherit autotools pkgconfig update-rc.d
-DEPENDS = "dbus glib-2.0 udev bluez4"
+DEPENDS = "dbus glib-2.0 udev ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', 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 ef4fbf0ba..b679200fb 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 dbad5a1b6..f1770c2d1 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
}