summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2015-05-04 17:15:38 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-05 22:15:18 +0100
commit1f6d4cc971da5ad04d5ceb52337116a2016560c9 (patch)
treee36e71284eebe41086c11fbdd9aff0a0d057f954 /meta/recipes-connectivity
parenta2b98efc0e07644df5ea8d1d498b0c8ca3a3cc3e (diff)
downloadpoky-1f6d4cc971da5ad04d5ceb52337116a2016560c9.tar.gz
connman: code cleanup
- cleanup multiple inherit lines; - RDEPENDS cleanup, use PACKAGECONFIG[] instead. (From OE-Core rev: 993594c018c845cc1cd58348d999dc9e52b778a4) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc13
1 files changed, 4 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index d068ba894a..17dc4b938c 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -13,7 +13,7 @@ LICENSE = "GPLv2"
13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ 13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
14 file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36" 14 file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36"
15 15
16inherit bluetooth 16inherit autotools pkgconfig systemd update-rc.d bluetooth
17 17
18DEPENDS = "dbus glib-2.0 ppp iptables" 18DEPENDS = "dbus glib-2.0 ppp iptables"
19 19
@@ -43,9 +43,9 @@ PACKAGECONFIG ??= "wispr \
43# PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp" 43# PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp"
44 44
45PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" 45PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
46PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant" 46PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant"
47PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}" 47PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}, ${BLUEZ}"
48PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono" 48PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono"
49PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," 49PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
50PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" 50PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn"
51PACKAGECONFIG[vpnc] = "--enable-vpnc --with-vpnc=${sbindir}/vpnc,--disable-vpnc,,vpnc" 51PACKAGECONFIG[vpnc] = "--enable-vpnc --with-vpnc=${sbindir}/vpnc,--disable-vpnc,,vpnc"
@@ -69,8 +69,6 @@ SYSTEMD_SERVICE_${PN} = "connman.service"
69SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" 69SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
70SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" 70SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup"
71 71
72inherit autotools pkgconfig systemd update-rc.d
73
74# This allows *everyone* to access ConnMan over DBus, without any access 72# This allows *everyone* to access ConnMan over DBus, without any access
75# control. Really the at_console flag should work, which would mean that 73# control. Really the at_console flag should work, which would mean that
76# both this and the xuser patch can be dropped. 74# both this and the xuser patch can be dropped.
@@ -114,9 +112,6 @@ RPROVIDES_${PN} = "\
114 112
115RDEPENDS_${PN} = "\ 113RDEPENDS_${PN} = "\
116 dbus \ 114 dbus \
117 ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', '${BLUEZ}', '', d)} \
118 ${@bb.utils.contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \
119 ${@bb.utils.contains('PACKAGECONFIG', '3g','ofono', '', d)} \
120 ${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)} \ 115 ${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)} \
121 " 116 "
122 117