summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc38
1 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 589ece8583..afc361ccc7 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -13,17 +13,9 @@ 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=d6a1ac98a6791c5294e8a7f176ecd66d" 14 file://src/main.c;beginline=1;endline=20;md5=d6a1ac98a6791c5294e8a7f176ecd66d"
15 15
16# we need to define the depends here, the dynamic stuff is too late 16DEPENDS = "dbus glib-2.0 ppp iptables gnutls"
17DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
18 ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \
19 ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
21 "
22 17
23INC_PR = "r19" 18INC_PR = "r20"
24
25TIST = "--enable-tist"
26TIST_powerpc = ""
27 19
28EXTRA_OECONF += "\ 20EXTRA_OECONF += "\
29 ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \ 21 ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
@@ -32,9 +24,6 @@ EXTRA_OECONF += "\
32 --enable-threads \ 24 --enable-threads \
33 --enable-loopback \ 25 --enable-loopback \
34 --enable-ethernet \ 26 --enable-ethernet \
35 ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
36 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
37 ${@base_contains('DISTRO_FEATURES', '3g', '--enable-ofono', '--disable-ofono', d)} \
38 --enable-tools \ 27 --enable-tools \
39 --enable-test \ 28 --enable-test \
40 --disable-polkit \ 29 --disable-polkit \
@@ -43,6 +32,17 @@ EXTRA_OECONF += "\
43 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ 32 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
44" 33"
45 34
35PACKAGECONFIG ??= "\
36 ${@base_contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \
37 ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \
38 ${@base_contains('DISTRO_FEATURES', '3g','3g', '', d)} \
39"
40
41PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
42PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4"
43PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"
44PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
45
46INITSCRIPT_NAME = "connman" 46INITSCRIPT_NAME = "connman"
47INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." 47INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
48 48
@@ -92,16 +92,16 @@ do_install_append() {
92RPROVIDES_${PN} = "\ 92RPROVIDES_${PN} = "\
93 connman-plugin-loopback \ 93 connman-plugin-loopback \
94 connman-plugin-ethernet \ 94 connman-plugin-ethernet \
95 ${@base_contains('DISTRO_FEATURES', 'bluetooth','connman-plugin-bluetooth', '', d)} \ 95 ${@base_contains('PACKAGECONFIG', 'bluetooth','connman-plugin-bluetooth', '', d)} \
96 ${@base_contains('DISTRO_FEATURES', 'wifi','connman-plugin-wifi', '', d)} \ 96 ${@base_contains('PACKAGECONFIG', 'wifi','connman-plugin-wifi', '', d)} \
97 ${@base_contains('DISTRO_FEATURES', '3g','connman-plugin-ofono', '', d)} \ 97 ${@base_contains('PACKAGECONFIG', '3g','connman-plugin-ofono', '', d)} \
98 " 98 "
99 99
100RDEPENDS_${PN} = "\ 100RDEPENDS_${PN} = "\
101 dbus \ 101 dbus \
102 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ 102 ${@base_contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \
103 ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ 103 ${@base_contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \
104 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ 104 ${@base_contains('PACKAGECONFIG', '3g','ofono', '', d)} \
105 " 105 "
106 106
107PACKAGES_DYNAMIC += "^${PN}-plugin-.*" 107PACKAGES_DYNAMIC += "^${PN}-plugin-.*"