summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2013-08-01 15:01:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-03 09:33:13 (GMT)
commit3cf0a5426aaee26451ad91036b00bd7ea8d9dde2 (patch)
tree8d9c3e605ff14dff7e8eeef4ecd2f7b214235812 /meta
parent973cfd8bbba7541fd620732edafde85a2be448e4 (diff)
downloadpoky-3cf0a5426aaee26451ad91036b00bd7ea8d9dde2.tar.gz
ofono: Move bluetooth enabling to .inc file
Moving the bluetooth enabling to ofono.inc from .bb file as it makes more sense to have bluetooth always checked. (From OE-Core rev: c7d27f4626f6763ec348c390cc907f30c102f96d) Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/ofono/ofono.inc1
-rw-r--r--meta/recipes-connectivity/ofono/ofono_1.12.bb1
-rw-r--r--meta/recipes-connectivity/ofono/ofono_git.bb4
3 files changed, 1 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index b0e8020..7adc667 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -14,6 +14,7 @@ INITSCRIPT_PARAMS = "defaults 22"
14 14
15EXTRA_OECONF += "\ 15EXTRA_OECONF += "\
16 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ 16 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
17 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
17" 18"
18SYSTEMD_SERVICE_${PN} = "ofono.service" 19SYSTEMD_SERVICE_${PN} = "ofono.service"
19 20
diff --git a/meta/recipes-connectivity/ofono/ofono_1.12.bb b/meta/recipes-connectivity/ofono/ofono_1.12.bb
index 44ab0a6..32c8bc2 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.12.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.12.bb
@@ -14,6 +14,5 @@ SRC_URI[sha256sum] = "733b75bfd1b2a1925b6de532989c496b8ae17a746691120ef64cceb00b
14 14
15EXTRA_OECONF += "\ 15EXTRA_OECONF += "\
16 --enable-test \ 16 --enable-test \
17 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
18" 17"
19CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" 18CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
diff --git a/meta/recipes-connectivity/ofono/ofono_git.bb b/meta/recipes-connectivity/ofono/ofono_git.bb
index f79f34f..db0bf73 100644
--- a/meta/recipes-connectivity/ofono/ofono_git.bb
+++ b/meta/recipes-connectivity/ofono/ofono_git.bb
@@ -8,10 +8,6 @@ PR = "r5"
8SRC_URI = "git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \ 8SRC_URI = "git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \
9 file://ofono" 9 file://ofono"
10 10
11EXTRA_OECONF += "\
12 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
13"
14
15do_configure_prepend () { 11do_configure_prepend () {
16 ${S}/bootstrap 12 ${S}/bootstrap
17} 13}