summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-12-16 14:11:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-19 18:07:58 +0000
commit2c8be7344e4ff24cf7161fa38f9db9e19dba777b (patch)
treec5cafe7b3a3f55eb5fed18854fb6a295c33f9e1e
parentb9ed702ee730a7c68f333b384a8f19c6f379ab63 (diff)
downloadpoky-2c8be7344e4ff24cf7161fa38f9db9e19dba777b.tar.gz
ofono: use PACKAGECONFIG for systemd and bluetooth
For clarity use PACKAGECONFIG for the systemd and bluetooth optional features. (From OE-Core rev: e76e7bf166544c1059c20753165a644dc1af750f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/ofono/ofono.inc16
1 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 9f65f4f144..bf44fcae08 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -7,16 +7,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
7 7
8inherit autotools pkgconfig update-rc.d systemd 8inherit autotools pkgconfig update-rc.d systemd
9 9
10DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)}" 10DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info"
11 11
12INITSCRIPT_NAME = "ofono" 12INITSCRIPT_NAME = "ofono"
13INITSCRIPT_PARAMS = "defaults 22" 13INITSCRIPT_PARAMS = "defaults 22"
14 14
15EXTRA_OECONF += "\ 15PACKAGECONFIG ??= "\
16 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ 16 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
17 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ 17 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \
18 --enable-test \ 18 "
19" 19PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
20PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
21
22EXTRA_OECONF += "--enable-test"
23
20SYSTEMD_SERVICE_${PN} = "ofono.service" 24SYSTEMD_SERVICE_${PN} = "ofono.service"
21 25
22do_install_append() { 26do_install_append() {