summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-12-16 15:25:23 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-19 18:07:59 +0000
commitf9ea9382a755841d750490279d98af372ac5fe87 (patch)
tree1beee584a100bc61a5c1e1dc856610daf79b555b
parent2c8be7344e4ff24cf7161fa38f9db9e19dba777b (diff)
downloadpoky-f9ea9382a755841d750490279d98af372ac5fe87.tar.gz
connman: use PACKAGECONFIG to control systemd option
(From OE-Core rev: fed354d79da865ee1017aa932449f329e4b11dd1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index f121a81f1e..ddabdb96f5 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -27,10 +27,10 @@ EXTRA_OECONF += "\
27 --enable-test \ 27 --enable-test \
28 --disable-polkit \ 28 --disable-polkit \
29 --enable-client \ 29 --enable-client \
30 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
31" 30"
32 31
33PACKAGECONFIG ??= "wispr \ 32PACKAGECONFIG ??= "wispr \
33 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \
34 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \ 34 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \
35 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \ 35 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \
36 ${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \ 36 ${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \
@@ -40,6 +40,7 @@ PACKAGECONFIG ??= "wispr \
40# local.conf or distro config 40# local.conf or distro config
41# PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp" 41# PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp"
42 42
43PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
43PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant" 44PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
44PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4" 45PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4"
45PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono" 46PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"