From 718e07647dc0529e28bbc031eadc612f05998774 Mon Sep 17 00:00:00 2001 From: Anders Darander Date: Wed, 17 Aug 2011 08:41:28 +0200 Subject: ofono: conditionally enable bluetooth Use DISTRO_FEATURE to conditionally depend on bluez4, as well as enabling bluetooth. (From OE-Core rev: 4024bf2874e9da4fd0dd9a2b90a48e8a259781cc) Signed-off-by: Anders Darander Signed-off-by: Richard Purdie --- meta/recipes-connectivity/ofono/ofono.inc | 2 +- meta/recipes-connectivity/ofono/ofono_0.50.bb | 1 + meta/recipes-connectivity/ofono/ofono_git.bb | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index a14b35a847..0b1a6e1234 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 ef4fbf0ba8..b679200fb0 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 dbad5a1b68..f1770c2d12 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 } -- cgit v1.2.3-54-g00ecf