summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Darander <anders@chargestorm.se>2011-08-17 06:41:28 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-17 14:18:31 (GMT)
commit718e07647dc0529e28bbc031eadc612f05998774 (patch)
treed3a22b7da3e84fa324d28136e347d98b969f932a
parentc8294d1e6da20f82d444a9d866bf5444a002dc5c (diff)
downloadpoky-718e07647dc0529e28bbc031eadc612f05998774.tar.gz
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 <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 a14b35a..0b1a6e1 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 \
7 7
8inherit autotools pkgconfig update-rc.d 8inherit autotools pkgconfig update-rc.d
9 9
10DEPENDS = "dbus glib-2.0 udev bluez4" 10DEPENDS = "dbus glib-2.0 udev ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)}"
11 11
12INITSCRIPT_NAME = "ofono" 12INITSCRIPT_NAME = "ofono"
13INITSCRIPT_PARAMS = "defaults 22" 13INITSCRIPT_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 \
7 7
8EXTRA_OECONF += "\ 8EXTRA_OECONF += "\
9 --enable-test \ 9 --enable-test \
10 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
10" 11"
11 12
12SRC_URI[md5sum] = "b2656fd0bbf33f926fc86c1e8915d697" 13SRC_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"
10SRC_URI = "git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \ 10SRC_URI = "git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \
11 file://ofono" 11 file://ofono"
12 12
13EXTRA_OECONF += "\
14 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
15"
16
13do_configure_prepend () { 17do_configure_prepend () {
14 ${S}/bootstrap 18 ${S}/bootstrap
15} 19}