diff options
| author |   Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2013-08-01 18:01:38 +0300 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2013-08-02 08:21:17 -0700 |
| commit | c7d27f4626f6763ec348c390cc907f30c102f96d (patch) | |
| tree | f51623e4f02264ea43da3a713474c06395ac4e13 /meta/recipes-connectivity/ofono | |
| parent | 1fb3560749a750884eafabc2d0b1cfb7fa56308a (diff) | |
| download | openembedded-core-contrib-c7d27f4626f6763ec348c390cc907f30c102f96d.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.
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity/ofono')
| -rw-r--r-- | meta/recipes-connectivity/ofono/ofono.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/ofono/ofono_1.12.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/ofono/ofono_git.bb | 4 |
3 files changed, 1 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index b0e80200e47..7adc667f991 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc @@ -14,6 +14,7 @@ INITSCRIPT_PARAMS = "defaults 22" EXTRA_OECONF += "\ ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ + ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ " SYSTEMD_SERVICE_${PN} = "ofono.service" diff --git a/meta/recipes-connectivity/ofono/ofono_1.12.bb b/meta/recipes-connectivity/ofono/ofono_1.12.bb index 44ab0a6dd89..32c8bc25cd8 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 EXTRA_OECONF += "\ --enable-test \ - ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ " CFLAGS_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 f79f34f37df..db0bf735b66 100644 --- a/meta/recipes-connectivity/ofono/ofono_git.bb +++ b/meta/recipes-connectivity/ofono/ofono_git.bb @@ -8,10 +8,6 @@ PR = "r5" 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 } |