summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2013-06-10 18:49:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-11 15:55:58 +0100
commit4ecc2bf2a9ff076ad3ef67b9118036e875599b55 (patch)
treee8e5588a3a7e794202331df97663ad4d32b6ee38
parentf302eb447b9138e7f4cd217da77aecbd5da70a75 (diff)
downloadpoky-4ecc2bf2a9ff076ad3ef67b9118036e875599b55.tar.gz
connman: use PACKAGECONFIG for WISPr support
(From OE-Core rev: a5161ed721791dbd32b90f1621b3eca92b2a9400) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman.inc10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 0eb58651c5..f250d78a17 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=d6a1ac98a6791c5294e8a7f176ecd66d" 14 file://src/main.c;beginline=1;endline=20;md5=d6a1ac98a6791c5294e8a7f176ecd66d"
15 15
16DEPENDS = "dbus glib-2.0 ppp iptables gnutls" 16DEPENDS = "dbus glib-2.0 ppp iptables"
17 17
18INC_PR = "r20" 18INC_PR = "r20"
19 19
@@ -32,7 +32,7 @@ EXTRA_OECONF += "\
32 ${@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)} \
33" 33"
34 34
35PACKAGECONFIG ??= "\ 35PACKAGECONFIG ??= "wispr \
36 ${@base_contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \ 36 ${@base_contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \
37 ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \ 37 ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \
38 ${@base_contains('DISTRO_FEATURES', '3g','3g', '', d)} \ 38 ${@base_contains('DISTRO_FEATURES', '3g','3g', '', d)} \
@@ -50,6 +50,8 @@ PACKAGECONFIG[openvpn] = "--enable-openvpn,--disable-openvpn,,openvpn"
50PACKAGECONFIG[vpnc] = "--enable-vpnc,--disable-vpnc,,vpnc" 50PACKAGECONFIG[vpnc] = "--enable-vpnc,--disable-vpnc,,vpnc"
51PACKAGECONFIG[l2tp] = "--enable-l2tp,--disable-l2tp,,xl2tpd" 51PACKAGECONFIG[l2tp] = "--enable-l2tp,--disable-l2tp,,xl2tpd"
52PACKAGECONFIG[pptp] = "--enable-pptp,--disable-pptp,,pptp-linux" 52PACKAGECONFIG[pptp] = "--enable-pptp,--disable-pptp,,pptp-linux"
53# WISPr support for logging into hotspots, requires TLS
54PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls,"
53 55
54INITSCRIPT_NAME = "connman" 56INITSCRIPT_NAME = "connman"
55INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." 57INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
@@ -89,7 +91,9 @@ do_install_append() {
89 91
90 install -d ${D}${bindir} 92 install -d ${D}${bindir}
91 install -m 0755 ${S}/tools/*-test ${D}${bindir} 93 install -m 0755 ${S}/tools/*-test ${D}${bindir}
92 install -m 0755 ${S}/tools/wispr ${D}${bindir} 94 if [ -e ${S}/tools/wispr ]; then
95 install -m 0755 ${S}/tools/wispr ${D}${bindir}
96 fi
93 install -m 0755 ${B}/client/connmanctl ${D}${bindir} 97 install -m 0755 ${B}/client/connmanctl ${D}${bindir}
94 98
95 # We don't need to package an empty directory 99 # We don't need to package an empty directory